diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..6a015eecb --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,22 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + commit-message: + prefix: build + include: scope + reviewers: + - "oscal-compass/compliance-trestle-maintainers" + + - package-ecosystem: "pip" + directory: "/" + schedule: + interval: "weekly" + commit-message: + prefix: build + include: scope + reviewers: + - "oscal-compass/compliance-trestle-maintainers" + open-pull-requests-limit: 10 diff --git a/.github/workflows/python-push.yml b/.github/workflows/python-push.yml index 9deb0d1e0..9d5909115 100644 --- a/.github/workflows/python-push.yml +++ b/.github/workflows/python-push.yml @@ -9,6 +9,8 @@ on: branches: - main +permissions: {} + jobs: set-versions: runs-on: ubuntu-latest @@ -88,6 +90,10 @@ jobs: continue-on-error: true run: | make code-typing + - name: Install documenation dependencies + if: steps.core-version.outputs.core == 'true' + run: | + make docs-ubuntu-deps - name: Validate website content (mkdocs) if: steps.core-version.outputs.core == 'true' run: | @@ -110,11 +116,16 @@ jobs: url: https://pypi.org/p/compliance-trestle if: github.ref == 'refs/heads/main' && github.repository == 'oscal-compass/compliance-trestle' steps: + - uses: actions/create-github-app-token@v1 + id: app-token + with: + app-id: ${{ secrets.APP_ID }} + private-key: ${{ secrets.PRIVATE_KEY }} - uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 - token: ${{ secrets.ADMIN_PAT }} + token: ${{ steps.app-token.outputs.token }} - name: Set up Python ${{ needs.set-versions.outputs.max }} uses: actions/setup-python@v5 with: @@ -126,9 +137,9 @@ jobs: # This action uses Python Semantic Release v8 - name: Python Semantic Release id: release - uses: python-semantic-release/python-semantic-release@v9.8.0 + uses: python-semantic-release/python-semantic-release@v9.8.8 with: - github_token: ${{ secrets.ADMIN_PAT }} + github_token: ${{ steps.app-token.outputs.token }} - name: Publish package distributions to PyPI uses: pypa/gh-action-pypi-publish@release/v1 @@ -137,10 +148,10 @@ jobs: if: steps.release.outputs.released == 'true' - name: Publish package distributions to GitHub Releases - uses: python-semantic-release/upload-to-gh-release@v9.8.0 + uses: python-semantic-release/upload-to-gh-release@v9.8.9 if: steps.release.outputs.released == 'true' with: - github_token: ${{ secrets.ADMIN_PAT }} + github_token: ${{ steps.app-token.outputs.token }} deploy-docs: runs-on: ubuntu-latest @@ -151,11 +162,16 @@ jobs: # Temporary hack: allow develop as well as master to deploy docs. if: github.ref == 'refs/heads/main' steps: + - uses: actions/create-github-app-token@v1 + id: app-token + with: + app-id: ${{ secrets.APP_ID }} + private-key: ${{ secrets.PRIVATE_KEY }} - uses: actions/checkout@v4 with: submodules: true fetch-depth: 0 - token: ${{ secrets.ADMIN_PAT }} + token: ${{ steps.app-token.outputs.token }} - name: Set up Python ${{ needs.set-versions.outputs.max }} uses: actions/setup-python@v5 # This is deliberately not using a custom credential as it relies on native github actions token to have push rights. @@ -164,6 +180,9 @@ jobs: - name: Install build tools run: | make develop + - name: Install documenation dependencies + run: | + make docs-ubuntu-deps - name: Create release shell: bash run: | @@ -178,16 +197,31 @@ jobs: cancel-in-progress: true if: github.ref == 'refs/heads/main' steps: + - uses: actions/create-github-app-token@v1 + id: app-token + with: + app-id: ${{ secrets.APP_ID }} + private-key: ${{ secrets.PRIVATE_KEY }} - uses: actions/checkout@v4 with: submodules: true ref: main fetch-depth: 0 - token: ${{ secrets.ADMIN_PAT }} + token: ${{ steps.app-token.outputs.token }} + - name: Get GitHub App User ID + id: get-user-id + run: echo "user-id=$(gh api "/users/${{ env.SLUG }}[bot]" --jq .id)" >> "$GITHUB_OUTPUT" + env: + GH_TOKEN: ${{ steps.app-token.outputs.token }} + SLUG: ${{ steps.app-token.outputs.app-slug }} - name: Configure Git run: | - git config user.name "Vikas Agarwal" - git config user.email "<>" + git config --global user.name '${{ env.SLUG }}[bot]' + git config --global user.email '${{ env.ID }}+${{ env.SLUG }}[bot]@users.noreply.github.com' + env: + SLUG: ${{ steps.app-token.outputs.app-slug }} + ID: ${{ steps.get-user-id.outputs.user-id }} + # https://docs.github.com/en/actions/security-for-github-actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable - name: Merge Main to Develop run: | git checkout develop diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index b3a02de17..dd50083a7 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -62,6 +62,9 @@ jobs: continue-on-error: true run: | make code-typing + - name: Install documenation dependencies + run: | + make docs-ubuntu-deps - name: Validate website content (mkdocs) run: | make docs-validate @@ -151,13 +154,13 @@ jobs: - name: Upload artifact if: steps.core-version.outputs.core == 'true' - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: coverage path: coverage.xml sonar: - if: ${{ github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url }} + if: ${{ (github.event.pull_request.base.repo.url == github.event.pull_request.head.repo.url && github.triggering_actor != 'dependabot[bot]' ) }} runs-on: ubuntu-latest needs: [ test, set-versions] steps: @@ -184,7 +187,7 @@ jobs: run: | make develop - name: Get coverage - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: coverage - name: SonarCloud Scan diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml new file mode 100644 index 000000000..88c2c299a --- /dev/null +++ b/.github/workflows/stale.yml @@ -0,0 +1,38 @@ +name: Stale Issues and PRs +on: + schedule: + - cron: '17 1 * * *' + workflow_dispatch: + +permissions: + contents: read + +jobs: + stale: + runs-on: ubuntu-latest + permissions: + issues: write + pull-requests: write + env: + STALE_WARNING_DAYS: 90 + STALE_CLOSURE_DAYS: 30 + steps: + - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # v9 + with: + stale-issue-label: stale + exempt-issue-labels: good-first-issue, help-wanted, exempt-from-stale + stale-issue-message: > + This issue has been automatically marked as stale because it has not had activity within ${{ env.STALE_WARNING_DAYS }} days. + It will be automatically closed if no further activity occurs within ${{ env.STALE_CLOSURE_DAYS }} days. + close-issue-message: > + This issue has been automatically closed due to inactivity. + days-before-issue-stale: ${{ env.STALE_WARNING_DAYS }} + days-before-issue-close: ${{ env.STALE_CLOSURE_DAYS }} + stale-pr-label: stale + stale-pr-message: > + This pull request has been automatically marked as stale because it has not had activity within ${{ env.STALE_WARNING_DAYS }} days. + It will be automatically closed if no further activity occurs within ${{ env.STALE_CLOSURE_DAYS }} days. + close-pr-message: > + This pull request has been automatically closed due to inactivity. Please reopen if this PR is still being worked on. + days-before-pr-stale: ${{ env.STALE_WARNING_DAYS }} + days-before-pr-close: ${{ env.STALE_CLOSURE_DAYS }} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 17dcce0bd..86f208c18 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,5 @@ tmp_bin_test /venv.trestle/ +# mkdocs +.cache/ diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9973e7249..21c4df4cd 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,7 @@ + repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 # Use the ref you want to point at + rev: v5.0.0 # Use the ref you want to point at hooks: - id: check-merge-conflict - id: check-yaml @@ -13,13 +14,13 @@ repos: - id: yapf args: [--in-place, --parallel, --recursive, --style, .yapf-config] files: "^(trestle|tests|scripts)" - stages: [commit] + stages: [pre-commit] additional_dependencies: [toml] - repo: https://github.com/PyCQA/flake8 - rev: 5.0.4 + rev: 7.1.1 hooks: - id: flake8 - args: [--extend-ignore, "P1,C812,C813,C814,C815,C816,W503,W605,B017,B028", "--illegal-import-packages=filecmp"] + args: [--extend-ignore, "P1,C812,C813,C814,C815,C816,W503,W605,B017,B028"] additional_dependencies: [ flake8-2020, @@ -37,14 +38,13 @@ repos: flake8-quotes, flake8-string-format, flake8-use-fstring, - flake8-illegal-import, pep8-naming, ] files: "^(tests|scripts)" exclude: "(oscal/|third_party)" - stages: [commit] + stages: [pre-commit] - id: flake8 - args: [--extend-ignore, "P1,C812,C813,C814,C815,C816,W503,W605,B017,B028", "--illegal-import-packages=filecmp"] + args: [--extend-ignore, "P1,C812,C813,C814,C815,C816,W503,W605,B017,B028"] additional_dependencies: [ flake8-2020, @@ -62,21 +62,21 @@ repos: flake8-quotes, flake8-string-format, flake8-use-fstring, - flake8-illegal-import, pep8-naming, flake8-bandit, dlint ] files: "^(trestle)" exclude: "(oscal/)" - stages: [commit] + stages: [pre-commit] - repo: https://github.com/executablebooks/mdformat - rev: 0.7.16 + rev: 0.7.17 hooks: - id: mdformat - exclude: "CHANGELOG.md|docs/mkdocs_code_of_conduct.md|docs/maintainers.md|docs/api_reference|tests/data/author|docs/contributing/mkdocs_contributing.md|tests/data/jinja_markdown_include|tests/data/jinja_cmd/number_captions_data.md|tests/data/jinja_cmd/number_captions_expected_output.md" + exclude: "CHANGELOG.md|docs/contributing/maintainers.md|docs/reference/API|tests/data/author|docs/contributing/index.md|tests/data/jinja_markdown_include|tests/data/jinja_cmd/number_captions_data.md|tests/data/jinja_cmd/number_captions_expected_output.md" additional_dependencies: - mdformat-tables - mdformat-config - mdformat-frontmatter - mdformat-gfm + diff --git a/CHANGELOG.md b/CHANGELOG.md index 27833eef6..5dde36617 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,14750 +1,15229 @@ # CHANGELOG +## v3.5.0 (2024-10-23) +### Build -## v3.3.0 (2024-07-15) +* build(deps): bump python-semantic-release/upload-to-gh-release (#1717) -### Chore +Bumps [python-semantic-release/upload-to-gh-release](https://github.com/python-semantic-release/upload-to-gh-release) from 9.8.8 to 9.8.9. +- [Release notes](https://github.com/python-semantic-release/upload-to-gh-release/releases) +- [Changelog](https://github.com/python-semantic-release/upload-to-gh-release/blob/main/releaserc.toml) +- [Commits](https://github.com/python-semantic-release/upload-to-gh-release/compare/v9.8.8...v9.8.9) -* chore: Merge back version tags and changelog into develop. ([`0c6e3d9`](https://github.com/oscal-compass/compliance-trestle/commit/0c6e3d917009885ddbe700d582b89a89e62d5983)) +--- +updated-dependencies: +- dependency-name: python-semantic-release/upload-to-gh-release + dependency-type: direct:production + update-type: version-update:semver-patch +... -### Documentation +Signed-off-by: dependabot[bot] <support@github.com> +Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`5e15a03`](https://github.com/oscal-compass/compliance-trestle/commit/5e15a035fc4e60b4f450f609d924813565b2b354)) -* docs: re-phrasing code of conduct reference (#1620) +* build(deps): bump python-semantic-release/upload-to-gh-release (#1683) -* docs: re-phrasing code of conduct reference - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* Update docs/mkdocs_code_of_conduct.md - -Co-authored-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* Update docs/mkdocs_code_of_conduct.md - -Co-authored-by: Jennifer Power <barnabei.jennifer@gmail.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Co-authored-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`7dabaee`](https://github.com/oscal-compass/compliance-trestle/commit/7dabaee6cfaeb61b4048847dafdde8b8d9ffa33d)) +Bumps [python-semantic-release/upload-to-gh-release](https://github.com/python-semantic-release/upload-to-gh-release) from 9.8.0 to 9.8.8. +- [Release notes](https://github.com/python-semantic-release/upload-to-gh-release/releases) +- [Changelog](https://github.com/python-semantic-release/upload-to-gh-release/blob/main/releaserc.toml) +- [Commits](https://github.com/python-semantic-release/upload-to-gh-release/compare/v9.8.0...v9.8.8) -* docs: removes CODE_OF_CONDUCT.md (#1609) +--- +updated-dependencies: +- dependency-name: python-semantic-release/upload-to-gh-release + dependency-type: direct:production + update-type: version-update:semver-patch +... -Removes the code of conduct file to allow -inheritance from the organization level - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`7ba70c3`](https://github.com/oscal-compass/compliance-trestle/commit/7ba70c3556e48b7b77333a132c8f47b3ea32df05)) +Signed-off-by: dependabot[bot] <support@github.com> +Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> +Co-authored-by: Chris Butler <chris.butler@redhat.com> +Co-authored-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`01332d3`](https://github.com/oscal-compass/compliance-trestle/commit/01332d3e7c73fd645788b67e4d5b81cec6ab8576)) -### Feature +* build(deps): Bump python-semantic-release/python-semantic-release (#1682) -* feat: adds `x-trestle-add-props` to the YAML header in SSP markdown (#1534) +Bumps [python-semantic-release/python-semantic-release](https://github.com/python-semantic-release/python-semantic-release) from 9.8.0 to 9.8.8. +- [Release notes](https://github.com/python-semantic-release/python-semantic-release/releases) +- [Changelog](https://github.com/python-semantic-release/python-semantic-release/blob/master/CHANGELOG.md) +- [Commits](https://github.com/python-semantic-release/python-semantic-release/compare/v9.8.0...v9.8.8) -* feat: adds `x-trestle-add-prop` processing to CatalogReader for SSP - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* feat: adds ADD_PROP header to ssp in ControlWriter - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* docs: updates ssp authoring tutorial docs in website - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* fix: updates docstring on add-props test function - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* docs: adds info on ssp props usage to ssp authoring tutorial - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - ---------- - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`cf3e552`](https://github.com/oscal-compass/compliance-trestle/commit/cf3e552061ecc11b78751a29b4a09f1f04c1d5b0)) +--- +updated-dependencies: +- dependency-name: python-semantic-release/python-semantic-release + dependency-type: direct:production + update-type: version-update:semver-patch +... -### Fix +Signed-off-by: dependabot[bot] <support@github.com> +Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> +Co-authored-by: Chris Butler <chris.butler@redhat.com> +Co-authored-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`56b019c`](https://github.com/oscal-compass/compliance-trestle/commit/56b019c1e8f5bf404d6c69bf3c2c00422f293d66)) -* fix: Ensure codeql still runs on main (#1618) ([`b796c0d`](https://github.com/oscal-compass/compliance-trestle/commit/b796c0ddf87f972d8fd86dcccd34b7998abd7fea)) +* build(deps): bump artifact actions from 2 to 4 (#1679) -* fix: abstract python version in pipelines (#1612) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`2e81958`](https://github.com/oscal-compass/compliance-trestle/commit/2e81958fe69b57455844006e98bf2cffe24a61bf)) - - -Signed-off-by: Chris Butler <chris.butler@redhat.com> ([`60b6452`](https://github.com/oscal-compass/compliance-trestle/commit/60b64524b8ddec97cd1977177551e13f856e8f4d)) +### Chore -* fix: correct vulnerabilities (#1611) +* chore: adds initial triaging process and stale issue handling (#1712) -* fix: correct vulns - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: add requests version - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct datamodel code gen dependency - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`a68439d`](https://github.com/oscal-compass/compliance-trestle/commit/a68439daf05f5aac279de8dca59132d8b4e9af6a)) +* chore: adds triaging process and stale workflow -* fix: improve trestle v3 README important info (#1592) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: improve trestle v3 README important info - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* add OSCAL models upgrade development info - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* Make mdformat happy. - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* relocate OSCAL migration section to contributing markdown - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* revise development status - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* make mdformat happy - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`0d7bc20`](https://github.com/oscal-compass/compliance-trestle/commit/0d7bc202389c85ec9f204ab2c45dac25a385a577)) +* docs: fix working in ROADMAP around stale issues -* fix: use pydantic.v1 plugin for mypy (#1595) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: use pydantic.v1 plugin for mypy - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* add mypy testcase - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* format & lint - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* sanity check - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* explicitly specify mypy config file - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* add mypy.cfg - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* revise mypy.cfg - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`fdd3d34`](https://github.com/oscal-compass/compliance-trestle/commit/fdd3d34d6da975c60b6b3457b1a933048eeca91b)) +* fix: fixes md formatting -* fix: update the regex of template version to prevent invalid version format (#1594) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Signed-off-by: Ma1h01 <yihaomai@gmail.com> ([`031850f`](https://github.com/oscal-compass/compliance-trestle/commit/031850f91a83f6fdd569025982a923cd10123938)) +* chore: reword ROADMAP.md section on stale issues -### Refactor +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* refactor: update trestle documentation webpage's Demo section to be in sync with the demo repo (#1614) +* fix: fixes markdown formatting -* refactor: remove obsolete ISM demo - -Signed-off-by: Ma1h01 <yihaomai@gmail.com> - -* fix: fix the arc42 demo link - -Signed-off-by: Ma1h01 <yihaomai@gmail.com> - -* refactor: extend and finish the Task examples section - -Signed-off-by: Ma1h01 <yihaomai@gmail.com> - ---------- - -Signed-off-by: Ma1h01 <yihaomai@gmail.com> ([`e5d510e`](https://github.com/oscal-compass/compliance-trestle/commit/e5d510e830ae69839129cb28d15b36f6fbaa4a67)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* refactor: update the error message when set parameters have invalid values (#1581) +--------- -Signed-off-by: Ma1h01 <yihaomai@gmail.com> -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`7ef4319`](https://github.com/oscal-compass/compliance-trestle/commit/7ef431970fcfe5563895c1864c304e2221819ded)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`0350791`](https://github.com/oscal-compass/compliance-trestle/commit/035079112490086964094a59159e333a8b4b467a)) -### Unknown +* chore: add html validation to build process (#1659) -* Merge pull request #1616 from oscal-compass/develop +Adds link validation to all links within the documentation ([`810f4e7`](https://github.com/oscal-compass/compliance-trestle/commit/810f4e7c1de7d0284ca970f225c47081fcc4bdaf)) -chore: Trestle release ([`11e1a06`](https://github.com/oscal-compass/compliance-trestle/commit/11e1a061f1dfb7a9f87d09ed4a53b0a3fa0badd1)) +* chore: Merge back version tags and changelog into develop. ([`dfe8929`](https://github.com/oscal-compass/compliance-trestle/commit/dfe892936e5960ad64f6f387dbe5918314049e89)) +### Ci -## v3.2.0 (2024-06-18) +* ci: updates GH credential strategy in the python-push.yml (#1726) -### Chore +* ci: updates python-push.yml to use a GitHub app for commit work -* chore: Merge back version tags and changelog into develop. ([`d72f1fd`](https://github.com/oscal-compass/compliance-trestle/commit/d72f1fdfe26cd03a92d07aabfa6cde37ab41bc70)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> + +* fix: removes extra ">" character + +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> + +--------- + +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`c69511a`](https://github.com/oscal-compass/compliance-trestle/commit/c69511a134d540b4e443a69f07e36caaa6321ec9)) ### Documentation -* docs: updates README.md communication details (#1588) +* docs: update the compliance-trestle-fedramp plugin usage (#1517) -Communication information is now centralized to -the community repo - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`a44312c`](https://github.com/oscal-compass/compliance-trestle/commit/a44312ce48e22bd71de9c6780e773b13b13eb575)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`e3aeb95`](https://github.com/oscal-compass/compliance-trestle/commit/e3aeb959aac761432e21908be86ee37b426e0d2e)) ### Feature -* feat: add risk properties support to csv-to-oscal-cd task (#1577) - -* feat: add risk properties support to csv-to-oscal-cd task - -Signed-off-by: Ma1h01 <yihaomai@gmail.com> - -* fix: update the risk properties tests to mock the risk columns instead of creating a new csv file - -Signed-off-by: Ma1h01 <yihaomai@gmail.com> - ---------- - -Signed-off-by: Ma1h01 <yihaomai@gmail.com> -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`dbe8e05`](https://github.com/oscal-compass/compliance-trestle/commit/dbe8e051cd4ad2ab073438a4e837356924d6e062)) +* feat(author-jinja): load jinja extensions from plugins (#1710) -### Fix +* Implement new helpers as jinja filters loaded via an extension -* fix: correct old pyhton versions (#1572) +Signed-off-by: Ryan Ahearn <ryan.ahearn@gsa.gov> -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`d6ca166`](https://github.com/oscal-compass/compliance-trestle/commit/d6ca1666c89a1ea5bfa54d4d242d0814e62668bd)) +* auto-load plugins with jinja extensions -* fix: handle NonNegativeIntegerDatatype and PositiveIntegerDatatype in gen_oscal (#1584) +Signed-off-by: Ryan Ahearn <ryan.ahearn@gsa.gov> -* fix: handle *IntegerDatatype during gen_oscal - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: test cases for NonNegative and Postive IntegerDatatypes - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`888c9eb`](https://github.com/oscal-compass/compliance-trestle/commit/888c9eb0f6ae106fefd3f9667d4fc9fa74f51008)) +* Refactor jinja organization for ease of reuse -* fix: correct the argument for get_rule_key in csv_to_oscal_cd.py (#1578) +Signed-off-by: Ryan Ahearn <ryan.ahearn@gsa.gov> -* fix: correct the argument for get_rule_key in csv_to_oscal_cd.py - -Signed-off-by: Ma1h01 <yihaomai@gmail.com> - -* test: correct comments and add another assert statement to test the existence of wrong key - -Signed-off-by: Ma1h01 <yihaomai@gmail.com> - ---------- - -Signed-off-by: Ma1h01 <yihaomai@gmail.com> -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`774e3cf`](https://github.com/oscal-compass/compliance-trestle/commit/774e3cff89647a5e2fbd494d5ec5f352a0dd0671)) +* Document plugins including jinja extensions -### Unknown +Signed-off-by: Ryan Ahearn <ryan.ahearn@gsa.gov> -* Merge pull request #1593 from oscal-compass/develop +* Rename first_array_entry filter for clarity -chore: Trestle release ([`8e7c490`](https://github.com/oscal-compass/compliance-trestle/commit/8e7c4905efd4eb174d2d9afe7f20c575bd3d2d52)) +fix some other random typos +Signed-off-by: Ryan Ahearn <ryan.ahearn@gsa.gov> -## v3.1.0 (2024-06-12) +* Update api docs -### Chore +Signed-off-by: Ryan Ahearn <ryan.ahearn@gsa.gov> -* chore: Merge back version tags and changelog into develop. ([`3d54f07`](https://github.com/oscal-compass/compliance-trestle/commit/3d54f07cad319cf6986dcc4c0abbbeec38b9bad7)) +* Add docs for new built-in jinja filters -### Feature +Signed-off-by: Ryan Ahearn <ryan.ahearn@gsa.gov> -* feat: logo (#1575) +* Correct the copyright line for new files -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`b33490a`](https://github.com/oscal-compass/compliance-trestle/commit/b33490a24c93521568697fc582ae48bf4af71181)) +Signed-off-by: Ryan Ahearn <ryan.ahearn@gsa.gov> -* feat: modify task csv_to_oscal_cd to allow any case for heading in csv file (#1573) +* Remove inherited dangling comment -Signed-off-by: Ma1h01 <yihaomai@gmail.com> -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`677c7ea`](https://github.com/oscal-compass/compliance-trestle/commit/677c7ea81d78c0d5356b3f0bb5b7563565a2938f)) +Signed-off-by: Ryan Ahearn <ryan.ahearn@gsa.gov> -### Fix +--------- -* fix: correct semantic release behaviour (#1564) +Signed-off-by: Ryan Ahearn <ryan.ahearn@gsa.gov> ([`f7b63ad`](https://github.com/oscal-compass/compliance-trestle/commit/f7b63ad77347532ed42585ff402ca5a7db512712)) -* fix: Update python-sem-ver - -Signed-off-by: Chris Butler <chris.butler@redhat.com> - -* fix: Update python semantic version to latest - -Signed-off-by: Chris Butler <chris.butler@redhat.com> - -* fix: Add uploading details - -Signed-off-by: Chris Butler <chris.butler@redhat.com> - -* fix: Add uploading details - -Signed-off-by: Chris Butler <chris.butler@redhat.com> - -* fix: clean up comments - -Signed-off-by: Chris Butler <chris.butler@redhat.com> - ---------- - -Signed-off-by: Chris Butler <chris.butler@redhat.com> -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`064274d`](https://github.com/oscal-compass/compliance-trestle/commit/064274d09b999767f0c5c58fbe854214f5674c43)) +### Fix -### Unknown +* fix(build): installs required build dependencies during semantic release build (#1736) -* Merge pull request #1582 from oscal-compass/develop +Semantic release is running in a container that does +not have access to the dependencies installed in `make +develop` step -chore: release ([`d068eb4`](https://github.com/oscal-compass/compliance-trestle/commit/d068eb406eab240e7bd8eb648a35eb3e51c2a6c9)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`4dbdf7d`](https://github.com/oscal-compass/compliance-trestle/commit/4dbdf7d0f330ef980e5ba19f445c9568004f5e85)) +* fix: support rule overlap for checks and target components (#1730) -## v3.0.1 (2024-06-03) +* fix: support rule overlap for checks and target components -### Breaking +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: updated README.md - breaking change (#1566) +* Fix type specification -BREAKING CHANGE: for new release - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`7397105`](https://github.com/oscal-compass/compliance-trestle/commit/739710572f7d62a390b3a71fe3d06f080dfc8ebe)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Chore +* Fix typing, second try. -* chore: Merge back version tags and changelog into develop. ([`6635584`](https://github.com/oscal-compass/compliance-trestle/commit/66355845add54147edbb613cf2e4acb45ba37162)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* chore: Merge back version tags and changelog into develop. ([`72717f2`](https://github.com/oscal-compass/compliance-trestle/commit/72717f2eff7a7beb726c5d7abd5052496624e7d7)) +* remove extraneous logging statement -### Documentation +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* docs: updates communication details in README.md (#1537) +--------- -* docs: updates communication details in README.md - -This is a seperate meeting/communication channel -from the Compliance WG adding new meeting details and slack channel - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* docs: add meeting notes link - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* fix: correct conversion link - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct lint error - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Co-authored-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`eb459a2`](https://github.com/oscal-compass/compliance-trestle/commit/eb459a292abb7251ee6d321a81d46d041f2a9b0a)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`11ab516`](https://github.com/oscal-compass/compliance-trestle/commit/11ab516a1cda022ea349d1dadae4179709486834)) -### Feature +* fix(refactor): clean up timezone deprecations (#1722) -* feat: oscal nist upgrade (#1550) +* fix(refactor): remove deprecated datetime functionality -* feat: support for latest OSCAL Version upgrade - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* feat: support OSCAL 1.1.2 (#1533) - -* fix: hack component schema, moving metadata location to same as other -models - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: add large line-length specification to pyptroject.toml for -datamodel-codegen - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* doc: discourse on changes made. - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix - automate schema metadata relocation in comp-def - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: undo fwd refs - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: HowMany - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: update gen_oscal.md with info on automated schema relocations - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: isolate schema fixup code - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: preprocess improved move metadata & assign Type4 - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix implementations move to common issues - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* OSCAL_VERSION 1.1.2 - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* dynamic year for copyright - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: reorder by name pre-processing; some post-processing (hacking) - -397 failed, 738 passed, 3 skipped, 34 warnings, 68 errors - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: code format/lint - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* hack: reduce failed/errors - -386 failed, 785 passed, 3 skipped, 34 warnings, 32 errors - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: hack for EmailAddressDatatype - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: issue hack warning/info - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: handle special case of "id: TokenDatatype" in catalog - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: introduce schema patching and employ for email-address and -parameter-selection - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: handle RiskStatus properly when applying renaming - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* code format & lint - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: validation error for Base64 - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix AttributeError: module 'trestle.oscal.ssp' has no attribute 'Status' - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix AttributeError: 'StringDatatype' object has no attribute 'strip' - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix Origin vs. Origin1 - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* Add Observation to assessment_results from common - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix value is not a valid enumeration member - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: import__test.py::test_import_wrong_oscal_version - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* patch schemas to rename “status” to “objectiveStatus” to avoid conflict - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* patch POAM schema to make RelatedObservation same as the other models - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix base 64 issue - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: determine common TaskValidValues, ThreatIdValidValues - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: improve pre-process reordering; handle special cases & valid values - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: nist content ssp example has moved and changed - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: OSCAL version in data/tasks/xlsx/output/profile.json - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix tests/trestle/tasks/oscal_catalog_to_csv_test.py::test_execute - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: code generation of URIReferenceDatatype - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix test_xlsx_execute_with_missing_rule_name_id - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix tests/trestle/tasks/xlsx_to_oscal_profile_test.py - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix tests/trestle/tasks/csv_to_oscal_cd_test.py - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix tests/trestle/tasks/ocp4_cis_profile_to_oscal_cd_test.py - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: test_generate_sample_model - OscalVersion - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix TypeError: unhashable type: 'WithId' - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: logger.warn deprecation - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix :test_profile_alter_props - 'str' object has no attribute 'value' - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: AssertionError: assert StringDatatype(__root__='1.1.2') == '1.1.2' - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix lint error - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: get rid of python 3.7 use (hopefully) - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: sonar exclude generated code (hopefully) - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix direct hack of NIST schema for EmailAddress (handle in “normalizer”) - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix direct hack of NIST schema for Selection (HowMany) - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: add common valid values integrity check - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* rectification of property name changes (objective_status, originations) - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* TelephoneType and AddressType valid values - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* ExternalScheme and DocumentScheme valid values - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* DefinedComponentType valid values - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* SystemComponentType valid values - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* code comments - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* simplify pre-process code - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* simplify - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* remove unused code - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* replace deprecated pkg_resources with importlib_resources - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* Add python 3.10 to matrix - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* python 3.9, 3.10, 3.11 - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* flake8 fix? - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* rename trestle.core.commands.author.profile to prof - lint shadow issue - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* update docs for change from author profile -> prof - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* add comments explaining refs creation in schema preprocessing - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* switch to pydantic latest version, but force v1 interface use for now - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: remedy 17 test warning by removing semantic release install - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* make sonar happy - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* make sonar happy - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* make sonar happy - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* use trestle.oscal.common.HowMany.one - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* supported versions of python are 3.9, 3.10. 3.11 - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* reduce some duplication, as per reviewer's comments. - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: remove unused parameters, per reviewer comments. - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* revise imports per reviewer suggestion. - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* 2.7.0 - -Automatically generated by python-semantic-release - -* restore python-semantic-release==7.33.2 to cfg (at old level, for now) - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* Remove "We've moved" from README - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: handle allOf construct (#1546) - -* fix: handle allOf construct - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* How did .value get removed in 2 places?? - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: merge & modify - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* test use of PositionValidValues as both string and enum - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* make flake8 happy - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: unify create_refs + body integrity check - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* remove use of extraneous constants - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Co-authored-by: semantic-release <semantic-release> - -* remove extraneous workflow lines of code (#1555) - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* Improve comments in new schema pre-processing module - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* upgrade cmarkgfm version - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* cmarkgfm==0.8.* - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* trestle version should not be updated by hand! - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* cmarkgfm==0.6.* - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* remove 1.1.2 from dir name & use tmp folder for fixup schemas - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* cmarkgfm==0.8.* works locally... - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* cmarkgfm==2024.1.* works locally - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* pydantic >= 2.0.0 - -* remove extraneous optional specifications - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Co-authored-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`82caf5f`](https://github.com/oscal-compass/compliance-trestle/commit/82caf5fe08796e10532410299d2032b2be7e7d61)) +Signed-off-by: Chris Butler <chris.butler@redhat.com> -### Fix -* fix: reverting last serm ver changes +--------- -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`9df0703`](https://github.com/oscal-compass/compliance-trestle/commit/9df0703aa925af836a8e07dcb45ed6db31daae11)) +Signed-off-by: Chris Butler <chris.butler@redhat.com> ([`7b8b353`](https://github.com/oscal-compass/compliance-trestle/commit/7b8b3537dc8d4edfb0bab554be32e53a6fd5ad2a)) -* fix: revert sem release changelog and version +* fix: add testing policy to contributing.md (#1697) -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`01427df`](https://github.com/oscal-compass/compliance-trestle/commit/01427df909cb8e3a25d46ba8e3c9049533d65a6b)) +* add testing policy to contributing.md -* fix: correct sonar quality checks (#1568) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`7f93f86`](https://github.com/oscal-compass/compliance-trestle/commit/7f93f86ac384d3c68b801a24e166fd1774c31103)) +* Add sonar cloud info. -* fix: remove obsolete text, fix broken links, fix spelling (#1565) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: remove obsolete text, fix broken links, fix spelling - -Signed-off-by: semantic-release (via Github actions) <semantic-release@github-actions> - -* fix: revised important note - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* make mdformat happy. - -Signed-off-by: Lou Degenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: semantic-release (via Github actions) <semantic-release@github-actions> -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Signed-off-by: Lou Degenaro <lou.degenaro@gmail.com> -Co-authored-by: semantic-release (via Github actions) <semantic-release@github-actions> ([`0955b4b`](https://github.com/oscal-compass/compliance-trestle/commit/0955b4b23537ea7d19d3902a7ff9e7c7e442a135)) +--------- -* fix: BREAKING CHANGE (#1560) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`8744cee`](https://github.com/oscal-compass/compliance-trestle/commit/8744cee2beb966e99b338e71ccf723b805b9b4d7)) -* fix: BREAKING CHANGE - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: BREAKING CHANGE - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct wording - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`f714b12`](https://github.com/oscal-compass/compliance-trestle/commit/f714b12d179a2e83f9ef4c1904668a67ed936c3f)) +* fix(markdown): writes component data for markdown without rules (#1695) -* fix: zoom link (#1530) +* test: adds failing test to confirm component definition bug -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`95ff6b7`](https://github.com/oscal-compass/compliance-trestle/commit/95ff6b7f53ab325ec106c47d28a44f5e70f5f964)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Unknown +* feat: adds implemented requirement and statement description information -* Merge pull request #1567 from oscal-compass/develop +The comp_dict is populated with the information from the OSCAL JSON +and logic on when to write parts left to the ControlWriter. -chore: Trestle release ([`c8be4ab`](https://github.com/oscal-compass/compliance-trestle/commit/c8be4ab948db048c8e3802b890abedc7de8733bc)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> +* fix: assemble component responses with and without rules -## v2.6.1 (2024-02-22) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Chore +* fix: updates control_rules logic to fix test failure -* chore: Merge back version tags and changelog into develop. ([`11fbcda`](https://github.com/oscal-compass/compliance-trestle/commit/11fbcdaeb1173ba131c20df6ba5be66bfc997b23)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Fix +* feat: centralizes logic for component inclusion in control writer -* fix: correct vuln for cryptography (#1520) +To ensure parts are written out for component definitions without +rules in a way that is not too verbose, parts will only be included +if they have rules attached or non-empty prose. -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`353cc2b`](https://github.com/oscal-compass/compliance-trestle/commit/353cc2b75e611b9d851cca2022f4e0fbe2936d16)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Unknown +* fix: updates formatting to make tests pass -* Merge pull request #1521 from oscal-compass/develop +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -chore: Trestle release ([`f097029`](https://github.com/oscal-compass/compliance-trestle/commit/f097029392963643932f471dbc7c1e6baec91896)) +* docs: updates docs to reflect component authoring behavior +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -## v2.6.0 (2024-02-22) +--------- -### Chore +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`25dbc7a`](https://github.com/oscal-compass/compliance-trestle/commit/25dbc7a4ae823c8645e8861f3763883e855b44af)) -* chore: Merge back version tags and changelog into develop. ([`6b2412e`](https://github.com/oscal-compass/compliance-trestle/commit/6b2412e7e0e34fdc32a5e1af06c3bdc46a7687e8)) +* fix(docs): add cookie consent popup (#1690) -### Feature -* feat: multiple parms per rule (#1499) -* feat: multiple parameters per rule - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: use correct columns names list - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: add test for multi-parameters per rule - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: a bit more on parameter sets in the help - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: code smell - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: test for modification to additional parameter set value - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: test for delete of additional param set - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`218ffe4`](https://github.com/oscal-compass/compliance-trestle/commit/218ffe47a879e8bbca115bd956cfc9e99bbc5751)) +--------- -### Fix +Signed-off-by: Chris Butler <chris.butler@redhat.com> ([`e67f73c`](https://github.com/oscal-compass/compliance-trestle/commit/e67f73c7cc3203037dd4d83b92ac317cd6e70978)) -* fix: add multiple parameters per rule support on component definition (#1504) +* fix(docs): correct build status icon is displayed in docs (#1689) -* fix: add multiple parameters per rule in component definition - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct code linting errors - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adding more testing - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: add a value for the rule parameter in tests - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct tests and add code for dup components validation - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct quality gate error - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct typo and fix test description - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct typo - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`96e3f02`](https://github.com/oscal-compass/compliance-trestle/commit/96e3f02fc597ded59ed11f5bd2b07aa2c0ccb504)) +Signed-off-by: Chris Butler <chris.butler@redhat.com> ([`5385092`](https://github.com/oscal-compass/compliance-trestle/commit/53850920bede72f40104cd2d70b80b06f994660a)) -* fix: community call (#1516) +* fix: add Python coding standards info (#1686) -* fix: update community call information - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: removing unneded separators - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: community meetings - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: agenda and notes - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: use every other Tue.; add login notes & calendar link - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: make mdformat happy. - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: update calendar info - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: add a passcode to zoom meeting - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct wording for zoom login - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct format check - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: rephrase login options - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Co-authored-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`53d7fd4`](https://github.com/oscal-compass/compliance-trestle/commit/53d7fd484bdd42e22ff58e3244da732835c2cfea)) +* Add Python coding standards info -* fix: correct vulnerability (#1509) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Co-authored-by: mrgadgil <49280244+mrgadgil@users.noreply.github.com> ([`4f70e0a`](https://github.com/oscal-compass/compliance-trestle/commit/4f70e0af0e4063ac3cd763ff0c7e319168c0d805)) +* correct english -* fix: add check for empty label to fix failure for statement with no label property (#1507) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* test: adds test for ssp assemble with fedramp profile - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* fix: adds fix for parts with no label during ssp-assemble - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* fix: don't put empty label into map - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: make sonar happy -> reduce complexity - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Co-authored-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`55ed462`](https://github.com/oscal-compass/compliance-trestle/commit/55ed462107d577efc9099b8ed59c5718eee9e47c)) +* address reviewer suggestion on PEP8 link location -### Unknown +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* Merge pull request #1519 from oscal-compass/develop +* Trestle updating and release logistics -chore: Trestle release ([`1987260`](https://github.com/oscal-compass/compliance-trestle/commit/198726001c6ea1911b11c1757f219eca032a46ad)) +Inspired by need to address OpenSSF requirement: +To enable collaborative review, the project's source repository MUST +include interim versions for review between releases; it MUST NOT +include only final releases. -## v2.5.1 (2024-01-18) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Chore +* Fix contributing copyright. -* chore: Merge back version tags and changelog into develop. ([`64c819a`](https://github.com/oscal-compass/compliance-trestle/commit/64c819a3b76acb3fb06396afc1f7fe2897ec1dab)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Fix +* add semantic release & tags info -* fix: correct security vulnerability (#1498) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`e23792c`](https://github.com/oscal-compass/compliance-trestle/commit/e23792cb1cde490fa2951866c9f99f9d43e9c669)) +--------- -### Unknown +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`1fe8457`](https://github.com/oscal-compass/compliance-trestle/commit/1fe8457b27cb87b537ba806dd7862c729e1e1ab8)) -* Merge pull request #1501 from oscal-compass/develop +* fix: lf footer website guidelines (#1678) -chore: Trestle release ([`7966956`](https://github.com/oscal-compass/compliance-trestle/commit/79669569572b8777c3ef1b1b6663c99af4002bff)) +* LF footer website guidelines +https://github.com/cncf/foundation/blob/main/website-guidelines.md -## v2.5.0 (2024-01-05) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Chore +* make mdformat -* chore: Merge back version tags and changelog into develop. ([`5ac3067`](https://github.com/oscal-compass/compliance-trestle/commit/5ac3067ad2e81eb3b0d31f2d3f05a12b44ec1072)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Feature +* Trestle created -* feat: add parameter value origin field to parameters (#1470) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: add parameter value origin field to parameters - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: remove wrong added field from oscal model - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: add param_value_origin to props and add validations - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct ci - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct param value origin cycle - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct profile-param-value-origin flow - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adding final corrections and test for inherited param-value-origin - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct formating - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: add step to ignore param-value-origin if no replacement was done in profile-param-value-origin - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct code format - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct tests - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: use replace me placeholder instead of literal text - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: use replace me tag in default value for param-value-origin - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct code format - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`b86aa2b`](https://github.com/oscal-compass/compliance-trestle/commit/b86aa2b5ef97a8fd988efb8ec995fb0624af6db0)) +* fix maintainers link -* feat: allow use of OpenSCAP result files in task xccdf_result_to_oscal_ar (#1411) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: Allow use of OpenSCAP result files in task xccdf_result_to_oscal_ar - -Before this commit if you wanted to use result files from OpenSCAP -in the task xccdf_result_to_oscal_ar you had to extract the -`TestResult` element and place it as the root of the XML -document, otherwise the resulting OSCAL document would be -blank. Thus making it impossible to directly use output from -OpenSCAP with the task. - -With this commit the task will detect that the root element -is not `TestResult` and then it will find the `TestResult` -element in the XML document. This allows the use of files -created by OpenSCAP using the `--results` and `--results-arf` -switches. - -Signed-off-by: Matthew Burket <mburket@redhat.com> - -* Add tests for OpenSCAP results files for task xccdf_result_to_oscal_ar_test - -Signed-off-by: Matthew Burket <mburket@redhat.com> - ---------- - -Signed-off-by: Matthew Burket <mburket@redhat.com> ([`eeb715c`](https://github.com/oscal-compass/compliance-trestle/commit/eeb715c4cd86c3bd5183592c03beac1cc46859d9)) +* <hr> -* feat: add inheritance view to ssp-generate and ssp-assemble (#1441) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: adds ability to process exports from SSP and write Markdown by component - -Adds ExportInterface and ExportWriter classes -Adds Markdown generation to ssp-generate -Add MarkdownWriter for leveraged statements - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Signed-off-by: Alex Flom <alexander.flom@gmail.com> - -* feat: adds InheritanceMarkdownReader for reading leveraged statement markdown - -Adds InheritanceMarkdownReader for processing into a leveraging SSP context -Adds persistance for components and satisified statements during updates -Changes leveraging component from a single dictionary to a list - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* feat: Adds reader class for inheritance markdown - -Adds ExportReader class -Removes ExportInterface class -Adds a single ByComponentInterface class to interact with the model -in terms of inheritance - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -Co-authored-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* docs: updates documentation with usage and API references updates for inheritance - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* chore: updates AgileAuthoring class for ssp-generate arg changes - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* docs: updates returns section in InheritanceMarkdownReader docstring - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* fix: updates line length on return statement in InheritanceMarkdownReader - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* refactor: updates markdown heading and comment strip function to remove regex - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* test: adds inheritance view testing for ssp-assemble - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* chore: adds more context to ExportReader class comments - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* feat: updates ssp-generate to filter control implementation for leveraged_ssp - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* refactor: updates ExportWriter to reduce code duplication - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* fix: updates ExportReader to add new statements if present in the inheritance view - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* fix: update logging to debug in ExportReader - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* refactor: simplify code in read_exports_from_markdown - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* tests: simplify tests for ExportReader test data generation - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* refactor: reduce code duplication in ExportReader methods - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* fix: allows inheritance info to be removed when component is unmapped - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* feat: adds leveraged authorization updates to system implementation - -Adds SSPInheritanceAPI class for interacting with leveraged auth -information - -Adds trestle global tags to markdown to store SSP location info - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -Co-authored-by: Alex Flom <alexander.flom@gmail.com> - -* docs: add docs updates for SSPInheritanceAPI class - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* chore: updates warning message for leveraged authorization with comps - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* fix: updates ssp-assemble to ensure existing leveraged comps persist - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* fix: adds fixes to address PR feedback - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* refactor: polishes SSPInheritanceAPI class to reduce complexity - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - ---------- - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Signed-off-by: Alex Flom <alexander.flom@gmail.com> -Co-authored-by: Alex Flom <aflom@redhat.com> -Co-authored-by: Alex Flom <alexander.flom@gmail.com> ([`6cf498b`](https://github.com/oscal-compass/compliance-trestle/commit/6cf498b26aa2a2d583714470038291b0567fb80a)) +* remove hr -### Fix +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: correct empty values going in assembled profile (#1491) +* fix maintainers reference -* fix: correct empty values going in assembled profile - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: add test case to check profile values replaced - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`136b712`](https://github.com/oscal-compass/compliance-trestle/commit/136b712cfaf0392ae5673a6103700014d27b2866)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: correct vulnerability (#1486) +* And license. -* fix: correct critical vulnerability - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correcting vulnerability - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`4610d24`](https://github.com/oscal-compass/compliance-trestle/commit/4610d247516c7ddc37a1b1774b31fbfb9f5012fa)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: move to new org (#1483) +* add cncf logo -* fix: move to new org - -github.com/IBM -> github.com/oscal-compass -ibm.github.io -> oscal-compass.github.io - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: run make mdformat - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: correct missing org changes - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Co-authored-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`c456779`](https://github.com/oscal-compass/compliance-trestle/commit/c4567792cc62b7e9e85c8dca0ce2d26fe82fcbc6)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: sonar (#1481) +* fix trestle website too -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`4e7e8fd`](https://github.com/oscal-compass/compliance-trestle/commit/4e7e8fd6618852dcceb4b464a7cabc91154e171a)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: correct critical vulnerability (#1479) +* restore maintainers.md -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`72b0f6f`](https://github.com/oscal-compass/compliance-trestle/commit/72b0f6f132fe7f6ed20fd29e47e13656082c0d29)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: link main readme to agile authoring setup repo (#1477) +* remove Red Hat from footer, per Red Hat request -* fix: link main readme to agile authoring setup repo - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: docs validate - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`88c1606`](https://github.com/oscal-compass/compliance-trestle/commit/88c16064897644db03aab11799a6dfc31ec8a1d2)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix(tests): pins oscal-content references in tests the latest 1.0 commit (#1474) +--------- -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`0dc7551`](https://github.com/oscal-compass/compliance-trestle/commit/0dc755184fb8c061cacc90cc930ea7b0c43f2b7c)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`40b2880`](https://github.com/oscal-compass/compliance-trestle/commit/40b2880ed9c0f9f7ff1fae71b17371306b57d4f6)) ### Unknown -* Merge pull request #1492 from oscal-compass/develop +* Merge pull request #1737 from oscal-compass/develop -chore: Trestle release ([`e6c42fa`](https://github.com/oscal-compass/compliance-trestle/commit/e6c42fad64855796fe21ca082cfc1c9fa879a2e9)) +chore: Trestle release ([`7d3ee4c`](https://github.com/oscal-compass/compliance-trestle/commit/7d3ee4c71780d314eaf27f8f0a5ca90d94375987)) -* fix - trestle direct dependency on requests pkg (#1488) +* Merge pull request #1735 from oscal-compass/develop -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`c112f9c`](https://github.com/oscal-compass/compliance-trestle/commit/c112f9cf1ec9ff5228b58a4383beb5f9684b9591)) +chore: Trestle release ([`26b7734`](https://github.com/oscal-compass/compliance-trestle/commit/26b77343b9bafd3c696f5586cf0e9beaf983dece)) +* fix(profile-resolve):handle unspecified aggregate parameters (#1709) -## v2.4.0 (2023-10-26) +Signed-off-by: Michael Davie <mldavie@amazon.com> +Co-authored-by: Alejandro Leiva <alejandro.leiva.palomo@ibm.com> ([`bc6f510`](https://github.com/oscal-compass/compliance-trestle/commit/bc6f51025bb29ae8f7828cee5f1803817574e322)) + +## v3.4.0 (2024-08-23) ### Chore -* chore: Trestle release +* chore: Merge back version tags and changelog into develop. ([`724ac16`](https://github.com/oscal-compass/compliance-trestle/commit/724ac169389e4d80cca4c336e17fbd5bed4cedff)) -chore: Trestle release ([`041a267`](https://github.com/oscal-compass/compliance-trestle/commit/041a267027e6023e477808934ba0727e411a5810)) +### Documentation -* chore: Merge back version tags and changelog into develop. ([`a633327`](https://github.com/oscal-compass/compliance-trestle/commit/a63332709d49e54a4cd541e6afdb02b232cbce7d)) +* docs: update maintainers list to reflect active maintainers (#1638) -### Documentation +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> +Co-authored-by: mrgadgil <49280244+mrgadgil@users.noreply.github.com> ([`f8daaae`](https://github.com/oscal-compass/compliance-trestle/commit/f8daaae2e57c9a582b9a94bd5128ed55a890a3bf)) -* docs: updating vtt documentation for trestle author docs (#1471) +* docs: updates CODE_OF_CONDUCT urls in README and website (#1635) -* docs: updating vtt documentation for trestle author docs - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct wording - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`63d436a`](https://github.com/oscal-compass/compliance-trestle/commit/63d436a7752e50ef0c52c93cbab36f4c1fc16748)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`08f387a`](https://github.com/oscal-compass/compliance-trestle/commit/08f387a074734a5ddd079d5f613220aa6b44242c)) -### Feature +* docs: adds ROADMAP.md with high level roadmap description (#1626) -* feat: adding validate template type to author docs command (#1465) +* docs: adds ROADMAP.md with high level roadmap description -* feat: adding validate template type to author docs command - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: rename test cases files to be more generic - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`5289f51`](https://github.com/oscal-compass/compliance-trestle/commit/5289f516e9710361e0dc391cefd979b5e2d46ed0)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Fix +* chore: refines working in ROADMAP.md for clarity -* fix: upgrade urllib version to fix vulnerability (#1472) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: upgrade urllib version to fix vulnerability - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct typo - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`e9d4175`](https://github.com/oscal-compass/compliance-trestle/commit/e9d4175fabd015ada6e8cdd26450c454ad83fbe8)) +* docs: updates ROADMAP.md with timeline information -* fix: improve bad property error message by including csv row number (#1466) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: improve bad property error message by including csv row number - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: handle empty ProfileSource correctly - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix sonar code smells - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix sonar code smell - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`ab97beb`](https://github.com/oscal-compass/compliance-trestle/commit/ab97beb2367112e9e68fb258af6dc2c75d909279)) +* docs: rewords section on iterations -* fix: cryptic error message + feat: # indicates comment column (#1459) +Adds more clarity around what takes place in +the 12-week period. No changes to the overall plan. -* Fix: improve error message when invalid property value specified - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* feat: support #column heading name ignored - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`45eda01`](https://github.com/oscal-compass/compliance-trestle/commit/45eda015751d2f9121e14fe609b14acd890440fd)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: update community call information (#1444) +--------- -* fix: update community call information - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: extending timeout time test - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct link - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: update community call info - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: remove unnecesary details on meeting host - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`5a03d06`](https://github.com/oscal-compass/compliance-trestle/commit/5a03d06783fff8db4bf402b1e21acb99fd485454)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`ed10dad`](https://github.com/oscal-compass/compliance-trestle/commit/ed10dadee72ac2bedf07c71095e598dc6f95b5bf)) +### Feature -## v2.3.1 (2023-09-20) +* feat: add parameter aggregation support for SSP (#1668) -### Chore +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`b2611d1`](https://github.com/oscal-compass/compliance-trestle/commit/b2611d1382c6ff1e9e1864e7fa1726dd7ad07eb5)) -* chore: Merge back version tags and changelog into develop. ([`420f341`](https://github.com/oscal-compass/compliance-trestle/commit/420f3410fccfcf1b3ddd606962290c9abed5ec2e)) +* feat: adds dependabot configuration for continous updates (#1647) -### Fix +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`4862c4a`](https://github.com/oscal-compass/compliance-trestle/commit/4862c4ac0ec9ce06988f1b6d75ad5986acbd3b78)) -* fix: improper indentation structure validation not working (#1451) +* feat: adds implementation parts to This System component in markdown (#1536) -* fix: improper indentation structure test - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: addition to full profile - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct profile generation issue - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correcting format - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adding new line each prose subpart gets added to final subpart - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correcting top comment on profile values comment - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`2e6936a`](https://github.com/oscal-compass/compliance-trestle/commit/2e6936a4705251fd8412fd67163a7cd9d801a4b8)) +* feat: adds implementation part prompts for This System -* fix: fixing typo in encoding name (#1448) +Changes in assembly are due to changes in the markdown breaking the unit tests +because the This System component is associated with each statement -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`bdf60b2`](https://github.com/oscal-compass/compliance-trestle/commit/bdf60b26075f7250bcdbbe08745630b27042ad74)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: parameter aggregation fix (#1443) +* fix: removes this system comp prose and status duplication -* fix: parameter aggregation fix - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: arranging tests - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: triggering build - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: increase time out for cache response - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: profile-values are shown in markdown even when there are values already - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adding alt identifier validation - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct profile values validation - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: remove parameter aggregation from assembly and remove label being shown in assembled profile - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correcting test failures and various formatting issues - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: change order for parameters in markdown - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: not setting empty values - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`dd9e3bc`](https://github.com/oscal-compass/compliance-trestle/commit/dd9e3bc2ebaeab23f3c4fc0647ec3942d38bed16)) +The process_main_component was overwriting the first prose +response to all the parts -* fix: prevent duplicates in set-parameters (#1450) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`62e2f05`](https://github.com/oscal-compass/compliance-trestle/commit/62e2f059dd2ae08616895ebdfd6e37258483019d)) +* chore: removes TODO comment for bug review -### Unknown +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* Merge pull request #1452 from IBM/develop +* chore: updates workding in comments in control_writer.py -chore: Trestle release ([`dd94dd8`](https://github.com/oscal-compass/compliance-trestle/commit/dd94dd8723bd23508504f789458510de6ae7c3d0)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> +* chore: moves part_a_text_edited into applicable unit tests -## v2.3.0 (2023-09-06) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Chore +* refactor: add include-all-parts to make part responses optional -* chore: Merge back version tags and changelog into develop. ([`3ea6add`](https://github.com/oscal-compass/compliance-trestle/commit/3ea6add2319bad28630afdcb9602c6b8e53fb125)) +To ensure the default markdown is not overly verbose, writing all +implementation parts and the inclusion of This System is optional. -* chore: adds typing fixes in profile.py for ProfileInherit (#1433) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`0593651`](https://github.com/oscal-compass/compliance-trestle/commit/0593651a6da82b3a73163e79ce376134e93a84a4)) +* docs: updates documentation with include-all-parts description -* chore: Merge back version tags and changelog into develop. ([`4f90258`](https://github.com/oscal-compass/compliance-trestle/commit/4f90258fc4490463de926fc77934d82b3ee6e7ac)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Feature +* chore: updates comments and docstring in control_writer.py updates -* feat: extend multiple templates validation to trestle author folders (#1430) +The goal is to increase the usefulness of the comments -* feat: extend multiple templates validation to trestle author folders command - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* docs: adding documentation to ne feature - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: addressing validation through name of template instead of type field - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: update guidance to correct wording - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: add x trestle ignore field in header to correct mismatch - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correcting mdformat - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct code linting problem - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: return template type field to template header - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* docs: correcting documentation for x-trestle-template-type field - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`c7bef58`](https://github.com/oscal-compass/compliance-trestle/commit/c7bef589a6e671b96170e93feb88c6436a094da6)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* feat: adds agile authoring functionality to public API in repository.py (#1432) +* fix: updates docstring in control_writer.py to improve clarity -Fixes #1426 - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`08b2559`](https://github.com/oscal-compass/compliance-trestle/commit/08b255902efb911c99422d49920c5ddaea98ef32)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* feat: support validation component_type for task csv-to-oscal-cd (#1431) +--------- -* feat: Support "validation" component_type for task csv-to-oscal-cd - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix sonar code smell - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* add notes to -i output regarding required/ignored columns - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* user properties for both validation and non-validation components - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`80aaa72`](https://github.com/oscal-compass/compliance-trestle/commit/80aaa72fe96217d1c7dd93e4c1d5bd9c34cb012b)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`54706af`](https://github.com/oscal-compass/compliance-trestle/commit/54706af0f9d428d10451823aa7d8d0f92a86e3eb)) ### Fix -* fix: correcting typo +* fix: cis benchmarks to catalog task, which mistakenly does not see all columns (#1657) -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`1810007`](https://github.com/oscal-compass/compliance-trestle/commit/181000731ada7af1348219581994bd58f2285329)) +* fix: allow sheet specification -* fix: correcting python semantice release version +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`a8cb9b9`](https://github.com/oscal-compass/compliance-trestle/commit/a8cb9b9f1f11485ac70fa2f35a3e52b917b7a783)) +* fix: number of columns is too small by 1 -* fix: moving watch config a level up (#1447) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: moving watch config a level up - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: disable check for changes build to make the change in mkdocs config - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: revert changes - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: change mkdocs version - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: fix typo - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: downgrade version to 1.5.0 - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: change mkdocstrings version to stable - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: change mkdocs to pull latest version - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`ea5607f`](https://github.com/oscal-compass/compliance-trestle/commit/ea5607f9f404f38da1abf1c40f907196ea79c567)) +* Fix: examine all columns -* fix: xccdf parameter type (#1440) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`431670c`](https://github.com/oscal-compass/compliance-trestle/commit/431670cd468693ca4581ec43d8de5d32413ec113)) +--------- -* fix: headings levels validation is not working properly (#1436) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`6c2d3f3`](https://github.com/oscal-compass/compliance-trestle/commit/6c2d3f3bd8d6eeaf04e0a931ce39b8b52646e95a)) -* fix: heading levels validation fixing - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correcting test cases and adding extra validation - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`22b65a9`](https://github.com/oscal-compass/compliance-trestle/commit/22b65a9b84af36d8c12c32c6e5c0dae88208ea49)) +* fix: skips sonar scans for dependabot updates (#1656) -* fix: default set-parameter values as list (#1438) +* fix: skips sonar scans for dependabot updates -* fix: default set-parameter values as list - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix string to list comment and blanks removal - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`419025d`](https://github.com/oscal-compass/compliance-trestle/commit/419025dfad47cf9f61b5e20a35a9683a84ed26e8)) +Dependabot updates only include third party dependency updates -* fix: expected nist profile missing (#1435) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`c96f9ce`](https://github.com/oscal-compass/compliance-trestle/commit/c96f9ce82e453c83a07d9d4c1061833f38c7f104)) +* fix: updates workflow if statement formatting -* fix: provide description and meaning to parameters in markdown (#1423) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: provide description and meaning to parameters in markdown - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: undo unneded removal to pass test cases - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: ordering list of parameter values displayed in markdown - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`266f67b`](https://github.com/oscal-compass/compliance-trestle/commit/266f67bd220e15922caacb4de0e702f4d0927ceb)) +--------- -### Unknown +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`050c425`](https://github.com/oscal-compass/compliance-trestle/commit/050c425771ccb52bd263b011e37e128a1eb8205f)) -* Merge pull request #1445 from IBM/develop +* fix: updates invalid dependabot configuation (#1650) -chore: Trestle release ([`73e125d`](https://github.com/oscal-compass/compliance-trestle/commit/73e125ded8cccada508fe7466ecd328847483b8f)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`e27f0cd`](https://github.com/oscal-compass/compliance-trestle/commit/e27f0cda76a89c7fe60e425916e8b85c3cb1fc30)) +* fix: correct logo redirection for PyPi page (#1644) -## v2.2.1 (2023-07-05) +* fix: correct logo redirection for PyPi page -### Chore +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Merge back version tags and changelog into develop. ([`e9dad2b`](https://github.com/oscal-compass/compliance-trestle/commit/e9dad2b7888332a6cf63b82670946f9492f27023)) +* fix: change develop to main branch in the logo link -### Fix +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: parameter value default is never required (#1419) +--------- -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`01434f1`](https://github.com/oscal-compass/compliance-trestle/commit/01434f13b16054b035767985a9a02ed9fa91154f)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`2c4899a`](https://github.com/oscal-compass/compliance-trestle/commit/2c4899a809cb28855943f4f3e89f3e9d771aaf1e)) -* fix: pydantic 2.0.0 break unit tests (#1418) +* fix: default value for optional string params should be None (#1621) -* fix: pydantic 2.0.0 break unit tests - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix minimum pydantic version - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`2138831`](https://github.com/oscal-compass/compliance-trestle/commit/2138831f9bb36c5f91ab17cccc4412128c468a82)) +* fix: default value for optional string params should be None -* fix: adding parameter aggregation from other parameter values for given control (#1412) +Signed-off-by: George Vauter <gvauter@redhat.com> -* feat: adding parameter aggregation functionality - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: fix code complexity - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: reduce code complexity - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: add parameters for test cases and reduce code complexity - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: fixing tests merge - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct code lint - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`7b8cad0`](https://github.com/oscal-compass/compliance-trestle/commit/7b8cad03e05024a406742720e5abed2e3febdf6f)) +* pin setuptools to min version suppported by setuptools_scm -* fix: assessment objectives formatting in markdown is not correct (#1414) +Signed-off-by: George Vauter <gvauter@redhat.com> -* fix: assessment objectives formatting in markdown is not correct - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: remove unneded variable - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`dbfc1d6`](https://github.com/oscal-compass/compliance-trestle/commit/dbfc1d6c59339a7f542f86cb74da4f05fe8a9a60)) +* fix: add include_all_parts to undo accidental deletion -### Unknown +Signed-off-by: George Vauter <gvauter@redhat.com> -* Merge pull request #1420 from IBM/develop +--------- -chore: Trestle release ([`2a0d40f`](https://github.com/oscal-compass/compliance-trestle/commit/2a0d40fada48b6263e6ce738ec94d930e94c4607)) +Signed-off-by: George Vauter <gvauter@redhat.com> ([`f81f567`](https://github.com/oscal-compass/compliance-trestle/commit/f81f5674ee2996532524eb014daadbbdbd33e6bb)) +* fix: allow forks to correctly run the pipelines (#1633) -## v2.2.0 (2023-06-26) +A small set of cleanups to the pipelines. -### Chore +--------- -* chore: Merge back version tags and changelog into develop. ([`1037c8e`](https://github.com/oscal-compass/compliance-trestle/commit/1037c8e35a31528a2610160a68f46f999e36d170)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> +Signed-off-by: Chris Butler <chris.butler@redhat.com> +Co-authored-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`af4e5a2`](https://github.com/oscal-compass/compliance-trestle/commit/af4e5a286279a0aebf70b1cb87fa97651711ada2)) -### Documentation +### Unknown -* docs: update maintainers list (#1394) ([`c53faa4`](https://github.com/oscal-compass/compliance-trestle/commit/c53faa40ce23a5ad5476cbb6e2c3d32a8e6818dc)) +* Merge pull request #1670 from oscal-compass/develop -### Feature +chore: Trestle release ([`2420d97`](https://github.com/oscal-compass/compliance-trestle/commit/2420d9740fbaa78f8a8a4b92c54747984db70717)) -* feat: add profile-inherit command (#1392) +* fix - make status and mitre column optional (#1649) -* test: adds testdata for profile init tests - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* feat(cli): adds profile-seed command - -Adds profile-seed as author subcommand -Adds profile-seed unit test -Adds SSP testdata - -Closes #1388 - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* chore: updates flag wording in profile.py - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* test: adds test case for profile-seed - -Adds additional test case to check for ids output -when all controls are filtered out - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* test: updates description leveraged ssp testdata - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* docs: updates author and tutorial docs with information on profile-seed command - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* chore: updates command to profile-inherit in docs and code - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* feat: adds excluded controls to the profile-inherit generated profile - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* docs: adds JSON example of profile-inherit import to website docs - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* chore: adds PR feedback on styling - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - ---------- - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`3bd53ff`](https://github.com/oscal-compass/compliance-trestle/commit/3bd53ff370cece77fc78082dbc04304af12c6647)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`47e6936`](https://github.com/oscal-compass/compliance-trestle/commit/47e6936e47d1fa0840aef5c26f36140438f03c98)) -* feat: oscal-catalog-to-csv (#1396) - -* feat: oscal-catalog-to-csv - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Populate testing spot checks. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* fix validate - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Use 'w' for output file open. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* fix windows csv. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Fix sonar complaints + improved test coverage - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Fix sonar complaint. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Improve test coverage. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* 100% test coverage. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`5f59a7f`](https://github.com/oscal-compass/compliance-trestle/commit/5f59a7fc7cf8b88a9f77ba4554dd493acff67114)) - -* feat: adds control origination to ssp-filter (#1375) - -* feat(cli): adds logic to filter ssp by control origination - -Adds test to test one and multiple control origination value inputs -Adds test to test bad control origintation value input -Adds filtering logic to ssp.py - -Closes #1361 - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* docs: updates trestle author docs with ssp-filter changes for control origination - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* fix: updates control origination flag value in ssp.py - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* fix: adds break to remove duplicate implemented requirements - -When filtering for control origination, the property could be -specified more than one time. This change adds a break and changes -to the test component defintion to ensure this case is covered. - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - ---------- - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`509afa7`](https://github.com/oscal-compass/compliance-trestle/commit/509afa7df124f8a6c3516ad06db256777baaef98)) +## v3.3.0 (2024-07-15) -### Fix +### Chore -* fix: drop python 3.7 support as required +* chore: Merge back version tags and changelog into develop. ([`0c6e3d9`](https://github.com/oscal-compass/compliance-trestle/commit/0c6e3d917009885ddbe700d582b89a89e62d5983)) -Adding extra steps to run builds on optional for 3.7.16 on macos latest and 3.7 for windows and ubuntu ([`cf4160b`](https://github.com/oscal-compass/compliance-trestle/commit/cf4160bc25336cb9362150906a8aaeda308c4134)) +### Documentation -* fix: Change the community call to use bluejeans events (#1400) +* docs: re-phrasing code of conduct reference (#1620) -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`9380cc8`](https://github.com/oscal-compass/compliance-trestle/commit/9380cc813f8b044640fecb4ee302207d3c66d29a)) +* docs: re-phrasing code of conduct reference -* fix: python 3.7.17 issue (#1408) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: python 3.7.17 issue - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* fix: python 3.7.17 issue - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`6849c3b`](https://github.com/oscal-compass/compliance-trestle/commit/6849c3b01d0adfd1261b9929a7d5c1866dd38973)) +* Update docs/mkdocs_code_of_conduct.md -* fix: log warning for duplicate part ids when writing markdown from json (#1395) +Co-authored-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: use empty string if part prose is None - -Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> - -* test: add test for checking no prose in part - -Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> - -* fix: write warning instead of exit with code 1 when duplicate parts - -Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> - ---------- - -Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> ([`760dd4b`](https://github.com/oscal-compass/compliance-trestle/commit/760dd4b4dd6ac405df3db0c2d39d9973ab61a0f4)) +* Update docs/mkdocs_code_of_conduct.md -* fix: use empty string if prose in part is None while writing to markdown (#1390) +Co-authored-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: use empty string if part prose is None - -Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> - -* test: add test for checking no prose in part - -Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> - ---------- - -Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`5427fbb`](https://github.com/oscal-compass/compliance-trestle/commit/5427fbb445e9a54a2ede1caa7e15c15b8977dd10)) +--------- -* fix: some tests failing on linux (#1387) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +Co-authored-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`7dabaee`](https://github.com/oscal-compass/compliance-trestle/commit/7dabaee6cfaeb61b4048847dafdde8b8d9ffa33d)) -Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`f0ffdec`](https://github.com/oscal-compass/compliance-trestle/commit/f0ffdecb963d7cd341b6b40be3a02efd3e76748d)) +* docs: removes CODE_OF_CONDUCT.md (#1609) -* fix: update readme with webex details (#1383) ([`4263f1a`](https://github.com/oscal-compass/compliance-trestle/commit/4263f1a72fa9a3ebea01b3b5c301cf89a962bf9c)) +Removes the code of conduct file to allow +inheritance from the organization level -### Unknown +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`7ba70c3`](https://github.com/oscal-compass/compliance-trestle/commit/7ba70c3556e48b7b77333a132c8f47b3ea32df05)) -* Merge pull request #1399 from IBM/develop +### Feature -chore: Trestle release ([`c3c28de`](https://github.com/oscal-compass/compliance-trestle/commit/c3c28de55120dc36988db1c3df95c3249ca5a26c)) +* feat: adds `x-trestle-add-props` to the YAML header in SSP markdown (#1534) +* feat: adds `x-trestle-add-prop` processing to CatalogReader for SSP -## v2.1.1 (2023-05-12) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Chore +* feat: adds ADD_PROP header to ssp in ControlWriter -* chore: Trestle release +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -chore: Trestle release ([`312203b`](https://github.com/oscal-compass/compliance-trestle/commit/312203b8c5eff6b50068a97b8f9be90ccb463438)) +* docs: updates ssp authoring tutorial docs in website -* chore: improve typing for mypy checks (#1350) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* initial typing fixes - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* phase 2 typing fixes - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* 20 files do not pass - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed lists - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweak - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* made requested changes - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - ---------- - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`041fa46`](https://github.com/oscal-compass/compliance-trestle/commit/041fa46690673eb82e5da711888ab57e801048b5)) +* fix: updates docstring on add-props test function -* chore: Merge back version tags and changelog into develop. ([`c4c972c`](https://github.com/oscal-compass/compliance-trestle/commit/c4c972cd8694257af10c3f2159f8a954e0b4c4b3)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Documentation +* docs: adds info on ssp props usage to ssp authoring tutorial -* docs: update community call webex link (#1366) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* docs: update community call webex link - -Signed-off-by: manjiree-gadgil <manjiree.gadgil@ibm.com> - -* docs: update community call webex link - -Signed-off-by: manjiree-gadgil <manjiree.gadgil@ibm.com> - -* docs: address mdformat modification - -Signed-off-by: manjiree-gadgil <manjiree.gadgil@ibm.com> - ---------- - -Signed-off-by: manjiree-gadgil <manjiree.gadgil@ibm.com> -Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`d5da18d`](https://github.com/oscal-compass/compliance-trestle/commit/d5da18d8f64fc0328d1b6592f663554c8aed3c22)) +--------- -* docs: add community call information ([`b6d6451`](https://github.com/oscal-compass/compliance-trestle/commit/b6d6451408b79171021e00d883132eed1f5871b6)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`cf3e552`](https://github.com/oscal-compass/compliance-trestle/commit/cf3e552061ecc11b78751a29b4a09f1f04c1d5b0)) ### Fix -* fix: change lint title action (#1352) +* fix: Ensure codeql still runs on main (#1618) ([`b796c0d`](https://github.com/oscal-compass/compliance-trestle/commit/b796c0ddf87f972d8fd86dcccd34b7998abd7fea)) -* test bad pr title action change - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adding current branch to run pr title action - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: changing settings for conventional pr title check - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: chaning pr lint flow - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct permissions on folders - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adding sudo to apt install - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adding correct branch - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correcting typo - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correcting branch - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: add step to check - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* bad pr title test (#1356) - -* bad pr title test - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* spacing - -* fix: adding sudo to apt install - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* adding space - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* change readme - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* Update README.md - -* Update README.md - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: fixing action condition - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct conditional - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: add config conventional install - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adding commitlint config - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: chaning branch to checkout - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* add validation just for title - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: grab the first commit msg - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adding config - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: add pull request event - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct action workflow - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: remove message - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adding merge commit to check - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: geting latest commit - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: setup default branch - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: fixing syntax error - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: inverting commit order - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: commitlint config - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: fixing typo - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correcting typo - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: fixing typo - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: missing install - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adding corrections - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: match pr title - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: add validation step - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct action - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: change pr title check steps - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adding correct config - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: fix mdformat errors in readme - -* fix: target main and develop branches - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Co-authored-by: manjiree-gadgil <manjiree.gadgil@ibm.com> ([`5444206`](https://github.com/oscal-compass/compliance-trestle/commit/5444206f8b8c8e6904ec180472c569e246255975)) +* fix: abstract python version in pipelines (#1612) -* fix: docs for task xlsx-result-to-oscal-ar replacing "osco" (#1369) -Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`850ed0a`](https://github.com/oscal-compass/compliance-trestle/commit/850ed0a99e0298496b0df1e91c22bd80c290b6e1)) -* fix: ssp response missing status and rules (#1358) +Signed-off-by: Chris Butler <chris.butler@redhat.com> ([`60b6452`](https://github.com/oscal-compass/compliance-trestle/commit/60b64524b8ddec97cd1977177551e13f856e8f4d)) -* quiet warning about system comp status - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added ssp md rules and status - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated ssp tutorial regarding the ssp demo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added options - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed ssp parameter substitution - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - ---------- - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`43daf5f`](https://github.com/oscal-compass/compliance-trestle/commit/43daf5f9fca2495c1dbb8fa2ea39cb7184a9e191)) +* fix: correct vulnerabilities (#1611) -* fix: xccdf to oscal-ar (#1336) +* fix: correct vulns -* fix: xccdf to oscal-ar - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* make docs - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Fix code smells. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Fix code smells. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Fix code smells. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Agreed upon changes for transformation of xccdf to OSCAL AR - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`7305883`](https://github.com/oscal-compass/compliance-trestle/commit/730588327ea54a5fc7a5d1f597a3ffeee92e0e48)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Handle tabs in statement prose and parts (#1359) +* fix: add requests version -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`c34dbea`](https://github.com/oscal-compass/compliance-trestle/commit/c34dbeaa7dd75cd614393c57cba97fa9e5c8d699)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: quiet warning about system component status as operational (#1354) +* fix: correct datamodel code gen dependency -* quiet warning about system comp status - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - ---------- - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`4313b85`](https://github.com/oscal-compass/compliance-trestle/commit/4313b850403e49a1db8e00f91e264e89e3175238)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Raise error if duplicate parts are found in the control statement (#1351) +--------- -* fix: Raise error if duplicate parts are found in statement - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Make lint happy - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Remove unnecessary logging - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - ---------- - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`74bd4f5`](https://github.com/oscal-compass/compliance-trestle/commit/74bd4f5e33c6d863fca3753955971ad460cac74a)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`a68439d`](https://github.com/oscal-compass/compliance-trestle/commit/a68439daf05f5aac279de8dca59132d8b4e9af6a)) -* fix: update author jinja command and add test (#1347) +* fix: improve trestle v3 README important info (#1592) -* update author jinja command and add test - -Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> - -* run yapf - -Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> - -* resolve flake8 D205 and D400 - -Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> - ---------- - -Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> ([`a0b1797`](https://github.com/oscal-compass/compliance-trestle/commit/a0b17972d82e106500f69dbfa78f86b8cf2da085)) +* fix: improve trestle v3 README important info -### Unknown +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix typo in task help text (#1365) +* add OSCAL models upgrade development info -Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`cbfa849`](https://github.com/oscal-compass/compliance-trestle/commit/cbfa849beda8b3bc42d6bc2ef8c07faa2cc559ca)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +* Make mdformat happy. -## v2.1.0 (2023-04-06) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Chore +* relocate OSCAL migration section to contributing markdown -* chore: Refactor control reader Part 2 (#1330) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* chore: Refactor the processing of editable parts - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Adjust typing for 3.8 - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Simplify code - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Process code blocks in the markdown prose correctly - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Address review comments - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Adjust warning and docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - ---------- - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`4a18b57`](https://github.com/oscal-compass/compliance-trestle/commit/4a18b57a0b4ab8888c4e266eac1b4a058d863b13)) +* revise development status -* chore: Refactoring of control reader to a new type of markdown node (Part 1) (#1317) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* chore: Refactor control reader to a new control markdown node - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Update docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Address sonar problems - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Add timeout on the get call - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - ---------- - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`2a43576`](https://github.com/oscal-compass/compliance-trestle/commit/2a43576d824a860451b95fe0ffb8c300d0137c78)) +* make mdformat happy -* chore: Merge back version tags and changelog into develop. ([`a1b1743`](https://github.com/oscal-compass/compliance-trestle/commit/a1b17432d413097958dac1be86ff0153694ddc9b)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Documentation +--------- -* docs: fix refs to version numbers and update docs (#1326) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`0d7bc20`](https://github.com/oscal-compass/compliance-trestle/commit/0d7bc202389c85ec9f204ab2c45dac25a385a577)) -* updated docs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added warning for ssp compdefs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* removed warning - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`525f0f8`](https://github.com/oscal-compass/compliance-trestle/commit/525f0f80de39dfe230ab3d95486533ab72473980)) +* fix: use pydantic.v1 plugin for mypy (#1595) -### Feature +* fix: use pydantic.v1 plugin for mypy -* feat: validate SSP rule parameter values (#1337) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* sketched rules validator and test - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* feat: Rules parameter values validation in SSP - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct parameter name on docstrings for rules_validator function - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correct value returned by val_diff_param_values function - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: getting rid of nist updates - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: initial logic handling for ssp - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* feat: adding rule param values validation for SSP - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: addressing code changes - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correcting tests - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: reducing conginitve complexity - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: addressing new changes - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: changing tests logic and addressing final changes - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: cleaning test files - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: remove unneded validation - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: fixing typo in validation - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: cleaning old ssp and generating new one for test - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: full debug logs on test - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: directory handling for setup ssp test - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: applying changes for tests to pass on rule params validator - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: cleaning up old and unused code - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: adressing few minor changes to format and code - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: optimizing logig for rule params validator - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`10dd58b`](https://github.com/oscal-compass/compliance-trestle/commit/10dd58b552f8f9a4618daea27e6d0ccd002dbd80)) +* add mypy testcase -* feat: adds implementation status to ssp-filter (#1338) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* docs: updates trestle author docs with ssp-filter changes - -Adds ssp-filter by implementation status - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* feat(cli): adds logic to filter ssp by implementation status - -- Adds test to test one and multiple implmentations status imputs -- Adds test to test bad implementation status input -- Adds filtering logic to ssp.py - -Closes #1332 - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* chore: updates ssp-filter test for updated compdef testdata - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* docs: updates wording on ssp-filter tutorial doc - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* chore: updates comment in ssp-filter test - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - -* refactor: updates ssp.py to use pre-defined constants and rewords errors - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> - ---------- - -Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`c33fc7d`](https://github.com/oscal-compass/compliance-trestle/commit/c33fc7d2ac9b430349962a08263db94c660a5f1c)) +* format & lint -* feat: remove root references (#1316) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* updated gen_oscal and submodules for oscal 1.04 - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* conversion completed all tests pass - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed makefile - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed .gitmodules - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* simplified makefile - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* more string consts - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* more details in oscal_normalize.py - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added mapping class after manual edit - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added mapping model - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* can now import mapping models - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* pulled from develop and updated docs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed typing - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed mapping-collection - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* root removed - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* updated docs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* bumped to oscal 1.0.4 and fixed checking of enums via text - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* updated docs for new oscal version support - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* merged dev and addressed pr feedback - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`0dfdc79`](https://github.com/oscal-compass/compliance-trestle/commit/0dfdc797090a5ccbc64b6ba0e2b2dd16464a65ae)) +* sanity check -### Fix +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Comply with IBM Github action policy (#1344) +* explicitly specify mypy config file -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`dd118f8`](https://github.com/oscal-compass/compliance-trestle/commit/dd118f84a26ce0e83cc4249837f91a118ae1f487)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: duplicate param_id should be invalid only in profile (#1341) +* add mypy.cfg -* initial fix - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added extra test for comp def - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - ---------- - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`0edbd81`](https://github.com/oscal-compass/compliance-trestle/commit/0edbd81efdb164f56d90972aca8bbf7539a6ba57)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: remove components from ssp during ssp-assemble and give warning (#1327) +* revise mypy.cfg -* feat: remove compdefs from ssp when no longer valid - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: correcting test case and adding warnings - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: add test case proof for comp-defs removal - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: change logic for using delete_list_from_list instead of delete_items_from_list - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: improving warning messages - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: changing tests for matching criteria - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: switching to default nist submodules - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: defining constant for generic uuid for testing - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fix: enhance processing and corrrect test cases - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`03d4f05`](https://github.com/oscal-compass/compliance-trestle/commit/03d4f05a1d0bb0ef7c81e768238b67ae5cfbf5ca)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: get_control_response was missing prose if statement has no parts (#1335) +--------- -* initial fix - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - ---------- - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`04c39d4`](https://github.com/oscal-compass/compliance-trestle/commit/04c39d4fb2911456c93495dce743cf971dec6f82)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`fdd3d34`](https://github.com/oscal-compass/compliance-trestle/commit/fdd3d34d6da975c60b6b3457b1a933048eeca91b)) -* fix: better error handling when no comps specified during ssp-assemble - and added docs (#1328) +* fix: update the regex of template version to prevent invalid version format (#1594) -* added test and docs for assem with no comps - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* debugging test failure - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* debug test 2 - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final test fix - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - ---------- - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`2ecdb98`](https://github.com/oscal-compass/compliance-trestle/commit/2ecdb987f22f3da4592acd636637134161f05a0b)) +Signed-off-by: Ma1h01 <yihaomai@gmail.com> ([`031850f`](https://github.com/oscal-compass/compliance-trestle/commit/031850f91a83f6fdd569025982a923cd10123938)) -* fix: ssp assemble includes controls not in the profile (#1325) +### Refactor -* fix for extra controls in ssp - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added debug line - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`138e95f`](https://github.com/oscal-compass/compliance-trestle/commit/138e95fd0598008b082fdf79a0306f68979c2c8e)) +* refactor: update trestle documentation webpage's Demo section to be in sync with the demo repo (#1614) -* fix: Version test (#1313) +* refactor: remove obsolete ISM demo -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`3c1d7bb`](https://github.com/oscal-compass/compliance-trestle/commit/3c1d7bb439deab94851d2d0eb3b6a6766a0b5601)) +Signed-off-by: Ma1h01 <yihaomai@gmail.com> -### Unknown +* fix: fix the arc42 demo link -* Merge pull request #1345 from IBM/develop +Signed-off-by: Ma1h01 <yihaomai@gmail.com> -chore: Trestle hotfix release ([`88f0847`](https://github.com/oscal-compass/compliance-trestle/commit/88f08473c05f3b2d5645820afabf8c8fe07dad0b)) +* refactor: extend and finish the Task examples section -* Merge branch 'main' into develop ([`48026eb`](https://github.com/oscal-compass/compliance-trestle/commit/48026eb2523ce9beeaddbfceec56e262c30b548e)) +Signed-off-by: Ma1h01 <yihaomai@gmail.com> -* Merge pull request #1343 from IBM/develop +--------- -chore: Trestle release ([`d18807c`](https://github.com/oscal-compass/compliance-trestle/commit/d18807c760c4e99f53c4a9feb2360f295413e103)) +Signed-off-by: Ma1h01 <yihaomai@gmail.com> ([`e5d510e`](https://github.com/oscal-compass/compliance-trestle/commit/e5d510e830ae69839129cb28d15b36f6fbaa4a67)) +* refactor: update the error message when set parameters have invalid values (#1581) -## v2.0.0 (2023-03-01) +Signed-off-by: Ma1h01 <yihaomai@gmail.com> +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`7ef4319`](https://github.com/oscal-compass/compliance-trestle/commit/7ef431970fcfe5563895c1864c304e2221819ded)) -### Breaking +### Unknown -* fix: BREAKING CHANGE (#1311) +* Merge pull request #1616 from oscal-compass/develop -* update docs - -BREAKING CHANGE: Breaking release of Trestle - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* update docs again - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - ---------- - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`cb86284`](https://github.com/oscal-compass/compliance-trestle/commit/cb86284f1d6ee0299dc41d7d0fe66bb61139ce5a)) +chore: Trestle release ([`11e1a06`](https://github.com/oscal-compass/compliance-trestle/commit/11e1a061f1dfb7a9f87d09ed4a53b0a3fa0badd1)) + +## v3.2.0 (2024-06-18) ### Chore -* chore: Merge back version tags and changelog into develop. ([`b5d7ab4`](https://github.com/oscal-compass/compliance-trestle/commit/b5d7ab434de140df26bed3636f957e243c8770b0)) +* chore: Merge back version tags and changelog into develop. ([`d72f1fd`](https://github.com/oscal-compass/compliance-trestle/commit/d72f1fdfe26cd03a92d07aabfa6cde37ab41bc70)) ### Documentation -* docs: update maintainers.md for missed contributors (#1304) +* docs: updates README.md communication details (#1588) -* added ekat alej - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed typo - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`5443597`](https://github.com/oscal-compass/compliance-trestle/commit/5443597b0b4cd826b58320e787f47d59f84fe06b)) +Communication information is now centralized to +the community repo -* docs: change trestle project references to workspace (#1276) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`a44312c`](https://github.com/oscal-compass/compliance-trestle/commit/a44312ce48e22bd71de9c6780e773b13b13eb575)) -* docs: change trestle project references to workspace - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* docs: changing workspace for trestle workspace - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* docs:fix inconsistency in case senstive for trestle workspaces - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`2f1b4fd`](https://github.com/oscal-compass/compliance-trestle/commit/2f1b4fd79bb67c509ee7f7c4f0d3a14502d0c71f)) +### Feature -* docs: create tutorial for task csv-to-cd (2) (#1257) +* feat: add risk properties support to csv-to-oscal-cd task (#1577) -* docs: create tutorial for task csv-to-cd - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* docs: create tutorial for task csv-to-cd - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Temporary disable pre-commit autoupdate - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Revise description: Resource_Instance_Type - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -Signed-off-by: degenaro <lou.degenaro@gmail.com> -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Co-authored-by: Ekaterina Nikonova <enikonovad@gmail.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`d31df9f`](https://github.com/oscal-compass/compliance-trestle/commit/d31df9fb3ac4049f4710c2c9655ef8b1d17575e8)) +* feat: add risk properties support to csv-to-oscal-cd task -### Feature +Signed-off-by: Ma1h01 <yihaomai@gmail.com> -* feat: cd resolved profile controls check (#1309) +* fix: update the risk properties tests to mock the risk columns instead of creating a new csv file -* feat: comp-def resolved profile controls validate (warn) option - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Use cwd as trestle workspace. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* validate-controls can be on, warn, off (default) - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Control_id_List cell should be stripped. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Spelling. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* 100% test coverage. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Use CatalogInterface to get list of control from catalog. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Add row descriptions to task info. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: degenaro <lou.degenaro@gmail.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`638dd53`](https://github.com/oscal-compass/compliance-trestle/commit/638dd5384c6588ad9bb88726c8d716cfc6e4b03b)) +Signed-off-by: Ma1h01 <yihaomai@gmail.com> -* feat: Add ability to view version of the individual OSCAL object (#1298) +--------- -* feat: Add ability to view version of the object - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Add docs and more tests - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Address review feedback - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Fix docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Address review comments - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - ---------- - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`cf2af61`](https://github.com/oscal-compass/compliance-trestle/commit/cf2af617fad82ccdfbebcd48948dd8a67512e7aa)) +Signed-off-by: Ma1h01 <yihaomai@gmail.com> +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`dbe8e05`](https://github.com/oscal-compass/compliance-trestle/commit/dbe8e051cd4ad2ab073438a4e837356924d6e062)) -* feat: new format csv to oscal component definition (#1285) +### Fix -Signed-off-by: degenaro <lou.degenaro@gmail.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`9572c4b`](https://github.com/oscal-compass/compliance-trestle/commit/9572c4b83c03eaec6518333670fa8d6c80cafbf2)) +* fix: correct old pyhton versions (#1572) -* feat: allow remote profiles to reference catalogs and profiles by relative path in href (#1288) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`d6ca166`](https://github.com/oscal-compass/compliance-trestle/commit/d6ca1666c89a1ea5bfa54d4d242d0814e62668bd)) -* import now handles local relative hrefs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* updated docs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* addressed pr changes - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`0a7e2cf`](https://github.com/oscal-compass/compliance-trestle/commit/0a7e2cf47680c19ef406aeb49afc35412478fc57)) +* fix: handle NonNegativeIntegerDatatype and PositiveIntegerDatatype in gen_oscal (#1584) -* feat: CIS spread sheet to OSCAL catalog (#1270) +* fix: handle *IntegerDatatype during gen_oscal -* Initial delivery. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Add tests. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Remove duplicate lines? - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Sonar. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Combined Profiles sheet, only. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Refine functionality + tests for 100% coverage. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Remove use of deprecated methods. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Support RHEL spread sheet. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Include namespace for props. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Fix comment. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* mkdocs - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* description -> statement - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Fix part-id. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Fix (rhel) multiple controls -> multiple profile props - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* More precise test case names. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Fix duplicate part ids. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Use BackMatter for links. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* factor out duplicate LOCs. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Replace "if len(my_array)" construct with "if my_array". - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Remove title from Resources in BackMatter for Links. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Remove first in property list detection: unnecessary. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`ba9dec0`](https://github.com/oscal-compass/compliance-trestle/commit/ba9dec0f4799b68160bd0e2aee66423763df21a6)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: csv to oscal cd reconcile3 (#1272) +* fix: test cases for NonNegative and Postive IntegerDatatypes -* feat: csv to oscal cd reconcile3 - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Major test cases changes. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Reduce code duplication in tests. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Remove extraneous test data file. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - ---------- - -Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`a19e7be`](https://github.com/oscal-compass/compliance-trestle/commit/a19e7be1ce8b8fb267bfd797ddcad742fdf4fcfd)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: SSP cli changes to load comp defs (#1264) +--------- -* added profile href - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* hooked profile title into all commands - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* use compdef info - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed rewrite behavior of ssp assemble - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed dropped control imps during ssp assemble - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* this system uuid now used - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* improved set param handling - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* values are now always list - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added props to comp_info - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed duplicate line - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* pull direct from compdefs into ssp - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* insert content into ssp - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* add bycomp at control level and require rules - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added rules check - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added imp status - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* tests pass with some things turned off - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* changed operational to planned - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed empty list - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved merging into ssp - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* assemble is now repeatable - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* ssp assemble now does not write if no change - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added more help comments to the md yaml header - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* boost coverage and cleanup - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* refactored smell - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* add set_param - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* updated docs and map setparams to rules - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed dropped setparams - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* addressed pr change requests - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed empty set params and rules at top level of imp req - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* flake8 ignore B017,B028 - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed docs and added error msg to ssp-filter - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed comment for rule param values - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* better handling of rule param value - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`2835eed`](https://github.com/oscal-compass/compliance-trestle/commit/2835eed4bf700ca0f90120063a707fb811f610fb)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`888c9eb`](https://github.com/oscal-compass/compliance-trestle/commit/888c9eb0f6ae106fefd3f9667d4fc9fa74f51008)) -* feat: ssp based on components and refactor (#1261) +* fix: correct the argument for get_rule_key in csv_to_oscal_cd.py (#1578) -* initial ssp based on comps - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* cleaned up for push - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* ssp mostly working - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* chore: Initial split - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* merged with refactor branch and added ssp test data - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* now generate ssp output - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* Split profile as markdown to parts, rename yaml_header - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fixed yaml header issue - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* Small change to component - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* more content in ssp header - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* A small fix in the header merge - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* more header content - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* cleaned up ssp header - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* improved comp gen - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* ssp gen and assemble mostly working - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* initial ssp-values working - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed test data for jinja and ssp outputs all controls - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* Make jinja tests happy - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* better handling ssp vals - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* better handling of ssp rules and params - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* Change doc strings - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fixed comp gen test - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* prompts are now comments - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* bracked around ssp params in prose - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* all tests pass - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* updated docs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* boosted coverage and fixed smells - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed empty lists in header - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed comment closure - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed empty lists - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved description text - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed empty lists - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* initial fixes to pr - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed list issues - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed stings - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* responded to multiple pr changes - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added test coverage - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed non-write of response prompt - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed repeat ssp gen issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* more fixes per pr feedback - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added tests for ssp_io and prune function - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* sort pruned controls - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* refactor cat interface - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added typing - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Co-authored-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`f0de73a`](https://github.com/oscal-compass/compliance-trestle/commit/f0de73ad2152be75f456ff5a1b273d6c1d21988b)) +* fix: correct the argument for get_rule_key in csv_to_oscal_cd.py -* feat: create separate markdown directories per source (#1242) +Signed-off-by: Ma1h01 <yihaomai@gmail.com> -* named dirs under comps works - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed ssp - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed duplicate keys bug - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* expanded test coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed bind - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed prune - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed rules - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* edited docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed review comments - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed try except block - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`3ffbdb0`](https://github.com/oscal-compass/compliance-trestle/commit/3ffbdb04da1c72aba7b1304c0060d948d5501608)) +* test: correct comments and add another assert statement to test the existence of wrong key -* feat: Add force-overwrite for generate (#1241) +Signed-off-by: Ma1h01 <yihaomai@gmail.com> -* feat: Add force overwrite for generate - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Update docs, increase coverage - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Reduce duplicates - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Address review feedback - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`d7612a9`](https://github.com/oscal-compass/compliance-trestle/commit/d7612a9a769d72e7a0338506aed4013b299519a7)) +--------- -### Fix +Signed-off-by: Ma1h01 <yihaomai@gmail.com> +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`774e3cf`](https://github.com/oscal-compass/compliance-trestle/commit/774e3cff89647a5e2fbd494d5ec5f352a0dd0671)) -* fix: codeql update from v1 to v2 (#1310) +### Unknown -* codeql to version 2 - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* updated docs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`6731560`](https://github.com/oscal-compass/compliance-trestle/commit/6731560201a596a986906086bf1d337d5495a816)) +* Merge pull request #1593 from oscal-compass/develop -* fix: Give warnings when component references control not loaded by profile for comp-gen and ssp-gen (#1305) +chore: Trestle release ([`8e7c490`](https://github.com/oscal-compass/compliance-trestle/commit/8e7c4905efd4eb174d2d9afe7f20c575bd3d2d52)) -* added tests - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added comment - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* changed errors to warnings and checked warning text in tests - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* removed unneeded logging commands - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* addressed pr feedback - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`429b3c1`](https://github.com/oscal-compass/compliance-trestle/commit/429b3c19023f4232b0853818c6039629dce4dc26)) +## v3.1.0 (2024-06-12) -* fix: Temporary fix for the multiline control statement in catalog-assemble (#1308) +### Chore -* fix: Temporary fix for the multiline statement bug - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Fix objective part as well - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Make matching case insensitive - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Delete trailing and leading new lines from the prose - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Delete spaces - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - ---------- - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`7a7aa8c`](https://github.com/oscal-compass/compliance-trestle/commit/7a7aa8cf53c8361d79cc837615bbf7fae3b134c9)) +* chore: Merge back version tags and changelog into develop. ([`3d54f07`](https://github.com/oscal-compass/compliance-trestle/commit/3d54f07cad319cf6986dcc4c0abbbeec38b9bad7)) -* fix: boost test coverage for component generate and assemble (#1306) +### Feature -* boosted coverage comp_gen assem - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* simplified test code - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`52b863b`](https://github.com/oscal-compass/compliance-trestle/commit/52b863b2ea684073afdb2ca85af7114ad43ac51c)) +* feat: logo (#1575) -* fix: ssp-generate error with components (#1303) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`b33490a`](https://github.com/oscal-compass/compliance-trestle/commit/b33490a24c93521568697fc582ae48bf4af71181)) -* initial fix of ssp gen issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* enhanced test data for coverage - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - ---------- - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`7a49a0a`](https://github.com/oscal-compass/compliance-trestle/commit/7a49a0a5e4a273755a2f6279a1cb51000cf02d40)) +* feat: modify task csv_to_oscal_cd to allow any case for heading in csv file (#1573) -* fix: adding multiple value set to rule param values during component … (#1301) +Signed-off-by: Ma1h01 <yihaomai@gmail.com> +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`677c7ea`](https://github.com/oscal-compass/compliance-trestle/commit/677c7ea81d78c0d5356b3f0bb5b7563565a2938f)) -* fix: adding multiple value set to rule param values during component assemble - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* fixed test for multiple values. cleaned up debug/info msgs from comp assemble - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* cleaned up warning and info messages - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* component -> component-def - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Frank Suits <frankst@au1.ibm.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Co-authored-by: Frank Suits <frankst@au1.ibm.com> ([`c357e15`](https://github.com/oscal-compass/compliance-trestle/commit/c357e15691bb9eee553c8531edd1f4ce024f60a3)) +### Fix -* fix: change python badge for addressing current python supported versions (#1300) +* fix: correct semantic release behaviour (#1564) -* fix: change python badge for addresing current python supported versions - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> - -* Fix docs page - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - ---------- - -Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Co-authored-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`7a8d895`](https://github.com/oscal-compass/compliance-trestle/commit/7a8d895d5ca16e9c7ebbcf3c862c14721d4a6421)) +* fix: Update python-sem-ver -* fix: allow edit of rule param values during component assemble (#1299) +Signed-off-by: Chris Butler <chris.butler@redhat.com> -* comp gen assemble loads rule param vals - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* updated docs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`041a2c3`](https://github.com/oscal-compass/compliance-trestle/commit/041a2c3d567b91404a7bc63ebdb9689b8a447463)) +* fix: Update python semantic version to latest -* fix: adding new components via markdown caused error (#1294) +Signed-off-by: Chris Butler <chris.butler@redhat.com> -* generalized last_modified setting - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* boosted component coverage - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`39fd590`](https://github.com/oscal-compass/compliance-trestle/commit/39fd590c85b7e2cf9b0e7770596def8c41e8ae98)) +* fix: Add uploading details -* fix: problem in cat assemble with subgroups (#1291) +Signed-off-by: Chris Butler <chris.butler@redhat.com> -* fixed groups in catalog assemble - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* added docs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`88337a4`](https://github.com/oscal-compass/compliance-trestle/commit/88337a4b16a24c8391a60e99347aa34cdb65307f)) +* fix: Add uploading details -* fix: assignment representation for ssp was not doing the right things (#1273) +Signed-off-by: Chris Butler <chris.butler@redhat.com> -* fixed ASSIGNMENT_FORM parameter rep - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* updated docs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* assignment now means needs assignment - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* simplified param_str code - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* made assignment form more generic with prefixes - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* made -bf consistent. started adding -sl - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed label rep mode - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* updated docs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* fixed issue with -sl, boosted coverage, added to jinja docs - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* pr feedback - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - ---------- - -Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`cac2aa3`](https://github.com/oscal-compass/compliance-trestle/commit/cac2aa351530f76834d53d10e08252ffb0786327)) +* fix: clean up comments -* fix: Remove attrs version pinning (#1280) +Signed-off-by: Chris Butler <chris.butler@redhat.com> -Removing pinning of attrs version, as there seems to be no breaking dependency. -I tested this using poetry command - -Signed-off-by: Pritam <pritamdutt@gmail.com> -Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> ([`8260e03`](https://github.com/oscal-compass/compliance-trestle/commit/8260e03cddcf682ebdf931f2b262f58156c8f56c)) +--------- -* fix: Fix typo in the curl (#1278) +Signed-off-by: Chris Butler <chris.butler@redhat.com> +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`064274d`](https://github.com/oscal-compass/compliance-trestle/commit/064274d09b999767f0c5c58fbe854214f5674c43)) -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`d7576d5`](https://github.com/oscal-compass/compliance-trestle/commit/d7576d5cc4e8536b1f94ca668b3b7b87e01f3148)) +### Unknown -* fix: rules at component level2 (#1259) +* Merge pull request #1582 from oscal-compass/develop -* docs: create tutorial for task csv-to-cd - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* docs: create tutorial for task csv-to-cd - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Temporary disable pre-commit autoupdate - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* docs: rules at component level - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* fix: rules at component level - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Revise description: Resource_Instance_Type - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -Signed-off-by: degenaro <lou.degenaro@gmail.com> -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Co-authored-by: Ekaterina Nikonova <enikonovad@gmail.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`3633d1f`](https://github.com/oscal-compass/compliance-trestle/commit/3633d1f0f4bcd7ee481f7db382aab2b23e91687f)) +chore: release ([`d068eb4`](https://github.com/oscal-compass/compliance-trestle/commit/d068eb406eab240e7bd8eb648a35eb3e51c2a6c9)) -* fix: trestle task csv-to-oscal-cd cannot handle whitespace (#1252) +## v3.0.1 (2024-06-03) -* fix: trestle task csv-to-oscal-cd cannot handle whitespace - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Test cases. - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`ac4b5e0`](https://github.com/oscal-compass/compliance-trestle/commit/ac4b5e08a8233d7f807cd6824197dca45f12b17b)) +### Breaking -* fix: Fix docs template validate flags (#1245) +* fix: updated README.md - breaking change (#1566) -* fix: Fix docs template validate flags - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Address feedback - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`6eac0c2`](https://github.com/oscal-compass/compliance-trestle/commit/6eac0c2c620d933761e9660021a5005490bf5ea5)) +BREAKING CHANGE: for new release -* fix: Adjust documentation (#1248) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`7397105`](https://github.com/oscal-compass/compliance-trestle/commit/739710572f7d62a390b3a71fe3d06f080dfc8ebe)) -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`5b31925`](https://github.com/oscal-compass/compliance-trestle/commit/5b31925ac82042db98467552bfef415796ca57d3)) +### Chore -* fix: Update flake8 in precommit (#1246) +* chore: Merge back version tags and changelog into develop. ([`6635584`](https://github.com/oscal-compass/compliance-trestle/commit/66355845add54147edbb613cf2e4acb45ba37162)) -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`a63b094`](https://github.com/oscal-compass/compliance-trestle/commit/a63b094ef05924ba8a8a600ff7ec5192bfe285d8)) +* chore: Merge back version tags and changelog into develop. ([`72717f2`](https://github.com/oscal-compass/compliance-trestle/commit/72717f2eff7a7beb726c5d7abd5052496624e7d7)) -### Unknown +### Documentation -* Merge pull request #1312 from IBM/develop +* docs: updates communication details in README.md (#1537) -chore: Trestle release ([`c41f873`](https://github.com/oscal-compass/compliance-trestle/commit/c41f873d0996b5100acf1952a0007201ef10a056)) +* docs: updates communication details in README.md +This is a seperate meeting/communication channel +from the Compliance WG adding new meeting details and slack channel -## v1.2.0 (2022-11-07) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Chore +* docs: add meeting notes link -* chore: Optimize images for imgbot (#1234) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* [ImgBot] Optimize images - -/docs/tutorials/ssp_profile_catalog_authoring/trestle_ssp_author_options.png -- 90.68kb -> 76.08kb (16.1%) - -Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com> - -* docs: edited docs - -Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com> -Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`17383ab`](https://github.com/oscal-compass/compliance-trestle/commit/17383abfbeb55adc4e34afdc2cec01a5899ee44e)) +* fix: correct conversion link -* chore: expand test coverage and make markdown more consistent (#1210) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fixed tests and clarified prompts for prose - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* refined parameters in yaml headers and added tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`6c551c6`](https://github.com/oscal-compass/compliance-trestle/commit/6c551c6fc4e220ed475f259af022ae366e6ed1fb)) +* fix: correct lint error -* chore: Optimize images (#1152) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> ([`5ce472d`](https://github.com/oscal-compass/compliance-trestle/commit/5ce472d077dff4857bd8412c63827b1285e51f06)) +--------- -* chore: Update documentation for the governed-documents (#1150) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +Co-authored-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`eb459a2`](https://github.com/oscal-compass/compliance-trestle/commit/eb459a292abb7251ee6d321a81d46d041f2a9b0a)) -* chore: Update governed-document documentation - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Add picture - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Address pr comments - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`2b37cd9`](https://github.com/oscal-compass/compliance-trestle/commit/2b37cd9f47b7f36ff790624be9a1da504efeadc0)) +### Feature -* chore: Merge back version tags and changelog into develop. ([`58bc2a5`](https://github.com/oscal-compass/compliance-trestle/commit/58bc2a5cb0bcc11e15c05e40aaf3b3cabc8b01d7)) +* feat: oscal nist upgrade (#1550) -### Documentation +* feat: support for latest OSCAL Version upgrade -* docs: update ssp and profile authoring guide to describe addition of parts (#1185) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* updated help prose when control written - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated ssp authoring docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* major additions to content - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed feedback and grouped into details sections - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`35c3c78`](https://github.com/oscal-compass/compliance-trestle/commit/35c3c78105721712340a3ab1a9fbe3fdba44ac8e)) +* feat: support OSCAL 1.1.2 (#1533) -### Feature +* fix: hack component schema, moving metadata location to same as other +models -* feat: Allow trestle init to specify the purpose of initialisation (#1228) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: Add init modes - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Fix tests - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Address review feedback - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`8d02b68`](https://github.com/oscal-compass/compliance-trestle/commit/8d02b68d5cae32273e179494bafb235c2a004a22)) +* fix: add large line-length specification to pyptroject.toml for +datamodel-codegen -* feat: provide full path to controls in catalog including sub-controls (#1227) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* added sub-control path to control - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added comment - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`ec96ee9`](https://github.com/oscal-compass/compliance-trestle/commit/ec96ee9067629b4d9932b39b2915b1b45bc6bae0)) +* doc: discourse on changes made. -* feat: get statement parts to allow easy capture of statement prose (#1221) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* added get statement parts - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added check - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`708b6b5`](https://github.com/oscal-compass/compliance-trestle/commit/708b6b52e152ac4b21563f415cc0da3c8ca2ff8a)) +* fix - automate schema metadata relocation in comp-def -* feat: remove default namespace and define generic trestle ns (#1215) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* no-ns now working - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed ns references - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`105152b`](https://github.com/oscal-compass/compliance-trestle/commit/105152b15bab526429394ba398c3f512266086df)) +* fix: undo fwd refs -* feat: made model equivalence check more rigorous (#1217) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* reworked models_are_equiv - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed sizeof checks - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added tests and clarified fields_set when Nones possible - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`ab89b45`](https://github.com/oscal-compass/compliance-trestle/commit/ab89b45286dfbbfd1b3f4b9dc003246b4050b9e1)) +* fix: HowMany -* feat: allow profile-resolve to specify brackets around value (#1207) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* added bracket format option - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweaked docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* simplified test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`16d9dbc`](https://github.com/oscal-compass/compliance-trestle/commit/16d9dbcdc7fadaf7ddbbdd9c19b68e99777c4551)) +* fix: update gen_oscal.md with info on automated schema relocations -* feat: show inherited props in yaml header for profile-generate markdown (#1198) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* added profile flow tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweak some code - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* more list comprehension - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* formalized merging of section_dicts from header and command line - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* inherited props now working - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed smells - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix: component generate will use sources in components if profile not specified (#1201) - -* fixed component generate with no profile given - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed pr change requests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* typing tweaks - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`d4b4680`](https://github.com/oscal-compass/compliance-trestle/commit/d4b4680e49ca8912ef34f0d472dc9997303227b8)) +* fix: isolate schema fixup code -* feat: csv to oscal component definition (#1197) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: csv to oscal component definition - -* Address comments from Ekaterina. - -* PR fixes - -- one control impl per source -- property Rule_Id mistakenly omitted - -* Issue #1195 - -- rules should be at source level -- for each source level, all rules should be in single property set - -* Issue #1195 - -- in impl req for each control, there should be a set of properties one -for each rule with Rule Id same except for remarks removed - -* Issue #1141 - -- "unknown" columns become another property for that rule & use user -defined namespace -- two namespaces in config, one is "standard" and other is "user" - -* Issue #1141 - -Fix missing property - -* Issue #1141 - -- specify in config column name to class mapping (Rule Id and Rule -Description, and user specified columns) - -* Issue #1141 - -- class is missing from prop in ipml reqs -- Rule_description prop is coming twice - -* Issue #1141 - -- Add initial test cases > 90% - -* Issue #1141 - -- test coverage 100% for csv_helper.py - -* Issue #1141 - -- test coverage 100% for csv_to_oscal_cd.py - -* Issue #1141 - -- check for and employ catalog (just one allowed, presently) - -* Issue #1141 - -- catalog title into component-definition - -* Issue #1141 - -- remove config flag: catalog-file -- add config flag: title - -* Issue #1141 - -- add to config: version (of component definition) - -* Issue #1141 - -- do not put class on private columns - -* fix: csv to cd command - -Co-authored-by: Vikas <avikas@in.ibm.com> -Co-authored-by: Vikas Agarwal <75295756+vikas-agarwal76@users.noreply.github.com> ([`c6e8bad`](https://github.com/oscal-compass/compliance-trestle/commit/c6e8bad9f8c3feaab12778c90dde45830ab6ab01)) +* fix: preprocess improved move metadata & assign Type4 -* feat: profile-resolve command to generate resolved profile catalog (#1194) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* added tests and removed script - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* simplified test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* expanded coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added tests and responded to pr requests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed unneeded dir check - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`9faf572`](https://github.com/oscal-compass/compliance-trestle/commit/9faf5726a1bc1bf8c9263a4d84a472653e76ebf9)) +* fix implementations move to common issues -* feat: added new parameter rep ASSIGNMENT_FORM to leave params in brackets with text (#1193) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* initial refactor to controlinterface - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* changed parameter format to ASSIGNMENT_FORM, refactored ControlInterface, made some private functions public - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`d41b2b6`](https://github.com/oscal-compass/compliance-trestle/commit/d41b2b665b6e455288724347165f51b3078ac487)) +* OSCAL_VERSION 1.1.2 -* feat: allow culling headers from an existing md file (#1180) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* working now - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added additional string test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* reverted markdownapi changes and moved to md_writer - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* reverted files for real - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed residual node code - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix typo boost coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* better culling of header content and added starting line to markdown node - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* handled pr feedback - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a0a0369`](https://github.com/oscal-compass/compliance-trestle/commit/a0a0369c53a7c06225e7e927aac8d8397f7b7c55)) +* dynamic year for copyright -* feat: handle display name and namespace (#1165) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* initial fix of dup headers - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final fixes - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* changed default position to ending - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* prop ns now working - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* handled pr feedback and new approach for namespaces - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed bug with namespace on profile assemble - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added file encoding - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a898216`](https://github.com/oscal-compass/compliance-trestle/commit/a898216c812411646e263482393fd9669f43a5b2)) +* fix: reorder by name pre-processing; some post-processing (hacking) -* feat: handle display name as property and initial handling of namespace option (#1162) +397 failed, 738 passed, 3 skipped, 34 warnings, 68 errors -* handle display-name - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`e6641fe`](https://github.com/oscal-compass/compliance-trestle/commit/e6641fea53e486d41df899f5adc73ee6d79c8e8c)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: profile add props to control or part, and add prose to statement part (#1158) +* fix: code format/lint -* improved component handling, cleaned up cache and import tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* component generate works with new format - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added control_read test with bad component header - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* enhanced coverage with updated test file - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* profile props working - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* labels work in profile - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* aggregated parts and adds in alters - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added props comment to yaml and refactored - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed smell - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* add profile title to generated markdown - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed package version limits for jinja and cryptography - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed pr requests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`541eddb`](https://github.com/oscal-compass/compliance-trestle/commit/541eddbfcbdf7b5fff6c4e6f765fda1a2f05bacf)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: Add various docs md improvements (#1159) +* hack: reduce failed/errors -* feat: Add various docs md improvements - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Make lint happy - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Make lint fully happy - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Increase test coverage, address review comments - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`c93b4a1`](https://github.com/oscal-compass/compliance-trestle/commit/c93b4a1554697d184544634fc182bdc01cfe5790)) +386 failed, 785 passed, 3 skipped, 34 warnings, 32 errors -* feat: add component-generate and component-assemble (#1145) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* initial sketch of author_component - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* initial implementation of author component - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* cleaned output - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed update_uuids.py - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed prose and clarified status consts - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improve typing for load top level model - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved typing and formalized component imp status support - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* cleaned up status defines and removed connection to fedramp in ssp author - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* clarified status - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* comp-gen works with imp status and remarks - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* now make multi-comp markdown - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added sketch of comp assemble - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed docstrings - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added comp assem test coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* major refactor of control io - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* made some privates public - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* implemented context and tests pass - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed copy reference issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tests pass and lint ok - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* cleaned up doc strings - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed some smells - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added generic classes for ssp and comp_def - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* handle status and remarks better - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved remarks handling - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* comp assemble working better - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed pr changes - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* enhanced component test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* temp fix to markdown version - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed small bug and enhanced test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed changes in comp generation and removed markdown version from setup.cfg - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a4caab2`](https://github.com/oscal-compass/compliance-trestle/commit/a4caab28c26b6391d4b258457c3009e960465a0f)) +* fix: hack for EmailAddressDatatype -### Fix +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Use python 3.8 for the release (#1236) +* fix: issue hack warning/info -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`7a9fbe8`](https://github.com/oscal-compass/compliance-trestle/commit/7a9fbe8a1dba77357fd5b87136a56d9ad06bd3a0)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Update the docs for governed documents (#1219) +* fix: handle special case of "id: TokenDatatype" in catalog -* fix: Update the docs for governed documents - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Fix index - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Fix grammar - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`b38a809`](https://github.com/oscal-compass/compliance-trestle/commit/b38a809c95d04c269498c036df5bc1c198ab679e)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Fix a bug in governed section validation (#1231) +* fix: introduce schema patching and employ for email-address and +parameter-selection -* fix: Small bug in validation - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Fix typos - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`c7f3c0d`](https://github.com/oscal-compass/compliance-trestle/commit/c7f3c0d566c988c63979a3bfb40d351824898e3b)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: add top level to parts output by get_statement_parts (#1230) +* fix: handle RiskStatus properly when applying renaming -* added high level statement part to query - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`597999e`](https://github.com/oscal-compass/compliance-trestle/commit/597999ef1898d5746e10b2fe706da7e4e57e936d)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: change implementation prompt for part (#1229) +* code format & lint -* added for part to imp response - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added explicit function to find imp label - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`f929aba`](https://github.com/oscal-compass/compliance-trestle/commit/f929abab713612810434363f8fc8530553b4b51a)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: empty dirs were created during comp-gen (#1225) +* fix: validation error for Base64 -* fixed issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`805c9f3`](https://github.com/oscal-compass/compliance-trestle/commit/805c9f3eb4b7cbd2ec717ae0cb0bec5cb0a2d37b)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: issue #1222 (#1223) +* fix AttributeError: module 'trestle.oscal.ssp' has no attribute 'Status' -Co-authored-by: Vikas Agarwal <75295756+vikas-agarwal76@users.noreply.github.com> ([`96c7290`](https://github.com/oscal-compass/compliance-trestle/commit/96c72902b6b4411e21df658cef5119f7be486829)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: better handling of params in component generate (#1220) +* fix AttributeError: 'StringDatatype' object has no attribute 'strip' -* no-ns now working - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed ns references - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* refactor and split catalog write - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed arg flags - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* comp_gen fails - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* comp def works - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* changed to param values - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix to get title - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed smell - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed lambda loop - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed doc string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed pr feedback - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`2675e2f`](https://github.com/oscal-compass/compliance-trestle/commit/2675e2f1ff5823787819b4854b4e35e034a1c8bf)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: csv to oscal cd task (#1208) +* fix Origin vs. Origin1 -* Issue #1141 - -- assure required columns present - -Signed-off-by: degenaro <lou.degenaro@gmail.com> - -* Issue #1141 - -- parameters - -* Issue #1141 - -Refactor code for quality improvement. - -* Issue #1141 - -- include missing columns -- fix several code smells -- fix bug in get_value - -* Issue #1141 - -- Fix code smells. - -* Issue #1141. - -- Fix code smell. - -* Issue #1141 - -- Code test coverage 100% - -* Issue #1141 - -- remove excess properties -- component description should be blank - -Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`049ee83`](https://github.com/oscal-compass/compliance-trestle/commit/049ee83f70e955fa92817222405adbc08f8deb5e)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: simple fix for statement labels not showing properly (#1213) +* Add Observation to assessment_results from common -* removed bad break - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`8d8ae1e`](https://github.com/oscal-compass/compliance-trestle/commit/8d8ae1e5d388e2491e6558f1325ff4d22cc5a58d)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: add profile title to comp-generate md and remove profile option (#1202) +* fix value is not a valid enumeration member -* removed profile option and added prof title to md - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed docstrings - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* reworked comp generate - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed status and rewrite issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* capture prose in description - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added prompt prose and test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`711597b`](https://github.com/oscal-compass/compliance-trestle/commit/711597b08490bcc8887d5970e376dc4c0e176df8)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: component definition issues (#1200) +* fix: import__test.py::test_import_wrong_oscal_version -* Issue #1141 - -- honor user_column.class in config file - -* fixed doc string - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`067fb91`](https://github.com/oscal-compass/compliance-trestle/commit/067fb9171b8396515cfb2dc6b06623a65cf81183)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: prof resolve should use moustache form as default (#1196) +* patch schemas to rename “status” to “objectiveStatus” to avoid conflict -* default to moustache - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed profile test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`530e28b`](https://github.com/oscal-compass/compliance-trestle/commit/530e28bf2143427b9b9dc1aa3cbfb4fb5c3ef2aa)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: profile assemble 'after' and 'by-id' issue, and added resolve_profile_catalog script (#1190) +* patch POAM schema to make RelatedObservation same as the other models -* initial fix - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed linting - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* handle subparts in prof-gen -assemble - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed sub-part issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed oscal version and resolved cat name - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final tweaks to prof resolution and added tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> -Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> ([`4c772dc`](https://github.com/oscal-compass/compliance-trestle/commit/4c772dcf141b9ffd6c92c62fb7efa586f82bd272)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Pull display name from the resolved catalog (#1192) +* fix base 64 issue -* fix: Pull display name from the catalog - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Small change - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`8cedd9f`](https://github.com/oscal-compass/compliance-trestle/commit/8cedd9f6ee4b45b8db762a81c2e59dfc83ce3504)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: ssp-assemble was not capturing prose properly for control level imp req responses (#1191) +* fix: determine common TaskValidValues, ThreatIdValidValues -* fixed comp def issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added doc - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`2a973cb`](https://github.com/oscal-compass/compliance-trestle/commit/2a973cb83ebaf925071c3bb59c0205b6e0387da3)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: name of subparts added into statement should not be "item" (#1184) +* fix: improve pre-process reordering; handle special cases & valid values -* changed item name assignment - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed jinja subparts test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`fcc79cb`](https://github.com/oscal-compass/compliance-trestle/commit/fcc79cb7db14385db1e2e174f27d18726ae4392e)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Add subparts to the markdown docs (#1182) +* fix: nist content ssp example has moved and changed -* fix: Add adds subparts to the markdown docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Make lint happy - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Make lint happy - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Address review comments - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`44e286b`](https://github.com/oscal-compass/compliance-trestle/commit/44e286ba1ba7369607b4299a13600c117fafd5ca)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: parts labeled Control should be Part (#1176) +* fix: OSCAL version in data/tasks/xlsx/output/profile.json -* fixed part vs. control bug - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* sub parts mostly working except statement prose - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed control statement prose test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed control props during cat assemble - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed log msgs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`6287991`](https://github.com/oscal-compass/compliance-trestle/commit/62879916da55804bd7171ba51c6794ec021e36d5)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Fix various issues in markdown docs (#1174) +* fix tests/trestle/tasks/oscal_catalog_to_csv_test.py::test_execute -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`4615be2`](https://github.com/oscal-compass/compliance-trestle/commit/4615be22ba4522455c441b8474aac45042606024)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: prevent output of default namespace in markdown (#1173) +* fix: code generation of URIReferenceDatatype -* fixed output of ns - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`7ffc37e`](https://github.com/oscal-compass/compliance-trestle/commit/7ffc37e0f0ef67c9a30bb309a7cf7eee11a77c24)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: combine parts props into a single add rather than two separate ones (#1172) +* fix test_xlsx_execute_with_missing_rule_name_id -* initial fix not working - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed order issue with by_ids - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed test after merge conflict - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a1ded2c`](https://github.com/oscal-compass/compliance-trestle/commit/a1ded2c08bb94c9b5b61ef828ac6fc73a3fb00c4)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: only show missing value warnings when resolving a profile for ssp (#1171) +* fix tests/trestle/tasks/xlsx_to_oscal_profile_test.py -* add show_value_warnings to control output of value warning messages - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`4afb7fc`](https://github.com/oscal-compass/compliance-trestle/commit/4afb7fc5b2cbb750bd4dbdd99e61825c04b61c07)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: duplicate headers and statement parts added in wrong place (#1163) +* fix tests/trestle/tasks/csv_to_oscal_cd_test.py -* initial fix of dup headers - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final fixes - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`ee505f5`](https://github.com/oscal-compass/compliance-trestle/commit/ee505f5b14a0281e9bda1365de7a4f2b15a5096b)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: utf8 issue (#1160) +* fix tests/trestle/tasks/ocp4_cis_profile_to_oscal_cd_test.py -* fixed utf8 issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated pre-commit - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`f1e2a9f`](https://github.com/oscal-compass/compliance-trestle/commit/f1e2a9fa0f44db46fd6674be29cbf1b7dd5bf14e)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Fix global headers validation when no drawio files are present (#1155) +* fix: test_generate_sample_model - OscalVersion -* fix: Fix headers validation - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Fix Sonar - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Fix review comments - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Fix typing - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`0d59427`](https://github.com/oscal-compass/compliance-trestle/commit/0d59427b89d3303b1392c08a7aa07a4ccdcab8a1)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: component generate with new format, clean up of cache tests (#1153) +* fix TypeError: unhashable type: 'WithId' -* improved component handling, cleaned up cache and import tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* component generate works with new format - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added control_read test with bad component header - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* enhanced coverage with updated test file - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a5ab848`](https://github.com/oscal-compass/compliance-trestle/commit/a5ab848e836198b09fe819307a2931de072df400)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Handle adding/deleting section from the markdown control (#1154) +* fix: logger.warn deprecation -* fix: Handle adding section to the control without alters - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Add tests - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Adress the reviews comment - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`40cd08b`](https://github.com/oscal-compass/compliance-trestle/commit/40cd08ba48522d20b26343690fb43f57580c610b)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Bump mkdocstring version (#1151) +* fix :test_profile_alter_props - 'str' object has no attribute 'value' -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`aad593b`](https://github.com/oscal-compass/compliance-trestle/commit/aad593b7fdf0a7019c736d5e464a7136f76f5085)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Correct typo in README (#1142) +* fix: AssertionError: assert StringDatatype(__root__='1.1.2') == '1.1.2' -Signed-off-by: folksgl <Gfolks14@gmail.com> ([`160707a`](https://github.com/oscal-compass/compliance-trestle/commit/160707a2e2fc23879085263806e851584d2dd405)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Dont add empty template folder (#1140) +* fix lint error -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`cf7a63b`](https://github.com/oscal-compass/compliance-trestle/commit/cf7a63bea9b442d39af8f4dccda5f7d484314cf6)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: allow catalog groups with no id and fix validation of links and reference matching (#1137) +* fix: get rid of python 3.7 use (hopefully) -* fixed link counting issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* refined warning - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* make id changes in groups - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* enhanced group id warning - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added load_validate functions - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added more complete test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* import order - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* adjust warning messages - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`9e1b206`](https://github.com/oscal-compass/compliance-trestle/commit/9e1b20686b85d166cee98b444e8deb7f40c06b3e)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: catalog-assemble was writing a new file when there were no changes to the file (#1139) +* fix: sonar exclude generated code (hopefully) -* fixed overwrite issue caused by empty params list in assembled catalog - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* cleaned up - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`e6949e2`](https://github.com/oscal-compass/compliance-trestle/commit/e6949e276dd683f5f54072b7db29c9bf15335d34)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: remove extraneous parens in unit tests. (#1138) +* fix direct hack of NIST schema for EmailAddress (handle in “normalizer”) -* Remove extraneous parens in unit tests. - -* Fix comment. - -* Fix .pre-commit-config.yaml. ([`90cb2ee`](https://github.com/oscal-compass/compliance-trestle/commit/90cb2ee8f3d6b04c69971a542440ad66fec5188c)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Fix trestle version in the docs (#1134) +* fix direct hack of NIST schema for Selection (HowMany) -* fix: Fix trestle version in the docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Downgrade version of mkdocstrings - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Update docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`d7d3cfc`](https://github.com/oscal-compass/compliance-trestle/commit/d7d3cfce8f2de248fc957a5146907cac118071a6)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Improve logging when validating headings in gov docs (#1133) +* fix: add common valid values integrity check -* fix: Improve logging when validating headings in gov docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Downgrade mkdocstrings for now - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`a641299`](https://github.com/oscal-compass/compliance-trestle/commit/a6412996d991c49261448b6eae80471d37ab2664)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Unknown +* rectification of property name changes (objective_status, originations) -* Merge pull request #1237 from IBM/develop +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -chore: Trestle release ([`85264e9`](https://github.com/oscal-compass/compliance-trestle/commit/85264e97c8cb8019b4478b121af7e5db258c5520)) +* TelephoneType and AddressType valid values -* Merge branch 'main' into develop ([`5994c29`](https://github.com/oscal-compass/compliance-trestle/commit/5994c29581a59e34b16932c3a9c0cdb63a8b93c9)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* Merge pull request #1235 from IBM/develop +* ExternalScheme and DocumentScheme valid values -chore: Trestle Release ([`ac6de64`](https://github.com/oscal-compass/compliance-trestle/commit/ac6de6416739a2ed0b77c314d5f4528a74885806)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +* DefinedComponentType valid values -## v1.1.0 (2022-05-24) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Chore +* SystemComponentType valid values -* chore: Merge back version tags and changelog into develop. ([`babfc7e`](https://github.com/oscal-compass/compliance-trestle/commit/babfc7eef148d5d6ff9c31f72c44f10093aa7c23)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Feature +* code comments -* feat: filter ssp by component +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`d675e49`](https://github.com/oscal-compass/compliance-trestle/commit/d675e4936151d0467362ada4442154cb841d87e2)) +* simplify pre-process code -* feat: validate refs and resources in catalogs and models +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`1c17bf7`](https://github.com/oscal-compass/compliance-trestle/commit/1c17bf75df4ceab99c6f3ae68ee620e57738d592)) +* simplify -### Fix +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: resolve pre-commit issue (#1126) +* remove unused code -* fix: resolve precommit issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix: updated doc string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`679cadc`](https://github.com/oscal-compass/compliance-trestle/commit/679cadc8bb839131d7a458b4b5cd082ed4535e24)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Do not validate extra files in author folders +* replace deprecated pkg_resources with importlib_resources -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`25a1721`](https://github.com/oscal-compass/compliance-trestle/commit/25a172160c651411c1521507557450d49592561d)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: better handling of child controls +* Add python 3.10 to matrix -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`c224f92`](https://github.com/oscal-compass/compliance-trestle/commit/c224f929ce2f9e682149e73055b7b195bbdaf92c)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: remove unused classes from the generated oscal files +* python 3.9, 3.10, 3.11 -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`9a3ee20`](https://github.com/oscal-compass/compliance-trestle/commit/9a3ee20be9520bad084ac2df556eacbd23c7907f)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Allow subfolders in template folder +* flake8 fix? -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`7223e1b`](https://github.com/oscal-compass/compliance-trestle/commit/7223e1b7d9dd8ef659867853a00cdbc7ca66a050)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: updated documentation +* rename trestle.core.commands.author.profile to prof - lint shadow issue -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`8eca1f0`](https://github.com/oscal-compass/compliance-trestle/commit/8eca1f0abc4a62a6e1db34b32b4f615aff097c0d)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Add control id to the generated docs +* update docs for change from author profile -> prof -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`b666956`](https://github.com/oscal-compass/compliance-trestle/commit/b666956adf221420b77a980eedec2ffc044d0e6e)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Unknown +* add comments explaining refs creation in schema preprocessing -* Merge pull request #1127 from IBM/develop +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -chore: Trestle Release ([`7ee1088`](https://github.com/oscal-compass/compliance-trestle/commit/7ee10884fc72ed318c3e62dd72b27518b16e4bf5)) +* switch to pydantic latest version, but force v1 interface use for now +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -## v1.0.2 (2022-05-05) +* fix: remedy 17 test warning by removing semantic release install -### Chore +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* chore: Merge back version tags and changelog into develop. ([`219bada`](https://github.com/oscal-compass/compliance-trestle/commit/219bada663cf6620c232718c50a6379c41473261)) +* make sonar happy -### Fix +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: check for circular imports during profile resolution (#1107) +* make sonar happy -* now check circular imports - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`81469db`](https://github.com/oscal-compass/compliance-trestle/commit/81469dbcca3ffcb140ac09023b7de17671c4386b)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: prevent moustaches in resolved profile catalog (#1106) +* make sonar happy -* better handling of choice prose - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added new test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`f9edc81`](https://github.com/oscal-compass/compliance-trestle/commit/f9edc8185db30330cfe33d3cf02ef55e90135692)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Add ability to remove group title (#1114) +* use trestle.oscal.common.HowMany.one -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`4303d76`](https://github.com/oscal-compass/compliance-trestle/commit/4303d760935b0f34a13cccf9caaac4e90a05de83)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: prevent blowfish warning due to new release of cryptography (#1112) +* supported versions of python are 3.9, 3.10. 3.11 -* force backlevel cryptography due to blowfish issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added doc string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`f13fe31`](https://github.com/oscal-compass/compliance-trestle/commit/f13fe31ae4c790ef7b495c3f5418d3c26de96841)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Unknown +* reduce some duplication, as per reviewer's comments. -* Merge pull request #1115 from IBM/develop +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -chore: Trestle bugfix release ([`746d239`](https://github.com/oscal-compass/compliance-trestle/commit/746d239ce64df487fae5bdbd5c727cfd132935cc)) +* fix: remove unused parameters, per reviewer comments. +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -## v1.0.1 (2022-04-27) +* revise imports per reviewer suggestion. -### Chore +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* chore: Merge back version tags and changelog into develop. ([`77f0e50`](https://github.com/oscal-compass/compliance-trestle/commit/77f0e50bfe4e369a215401f9a4b9e56d193fd829)) +* 2.7.0 -### Fix +Automatically generated by python-semantic-release -* fix: bump readme refs to 1.0.x (#1103) +* restore python-semantic-release==7.33.2 to cfg (at old level, for now) -* initial change to 1.0.x - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final changes for 1.0.x - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`488cd40`](https://github.com/oscal-compass/compliance-trestle/commit/488cd4003a97d0142cc65e91fa660dd2b83bd75b)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Unknown +* Remove "We've moved" from README -* Merge pull request #1104 from IBM/develop +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -chore: Trestle Stable Release OSCAL 1.0.2 ([`f992596`](https://github.com/oscal-compass/compliance-trestle/commit/f99259668f9faf8ed7af0b0a41beb8dc4b9d4cd4)) +* fix: handle allOf construct (#1546) +* fix: handle allOf construct -## v1.0.0 (2022-04-27) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Breaking +* How did .value get removed in 2 places?? -* feat: updated to OSCAL 1.0.2 support (#1097) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -BREAKING CHANGE: pushed to OSCAL 1.0.2 - -* updated to oscal 1.0.2 and tests pass - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated readme and move oscal version - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated json oscal version to 1.0.2 - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* clarified wording re 1.0.0 and 1.0.2 - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a2aa3dd`](https://github.com/oscal-compass/compliance-trestle/commit/a2aa3dd53e67096004ba4e202fef8c7586462888)) +* fix: merge & modify -### Chore +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* chore: Merge back version tags and changelog into develop. ([`4b6500e`](https://github.com/oscal-compass/compliance-trestle/commit/4b6500e58189db65254b9c13864fbb01cc4278a7)) +* test use of PositionValidValues as both string and enum -### Documentation +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* docs: update readme and index md files (#1099) +* make flake8 happy -* updated readme and index - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweaked docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`f0bd541`](https://github.com/oscal-compass/compliance-trestle/commit/f0bd5412be6bb7b9f88dc2ee3f6b1608c12a9268)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Fix +* fix: unify create_refs + body integrity check -* fix: various task transformer improvements (#1100) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: various task transformer improvements - -for xlsx -- remove support for column "Version" -- add support for columns "goal_version", "rule_name_id", "rule_version" -- add support for profile-type generation "by-goal", "by-rule", -"by-control", "by-check" -- skip rows where control_id or goal_id is missing with complaint -- skip rows where control_id and goal_id are missing, after 100 -consecutive terminate processing -- improve sotring of controls - -for ocp4 -- give warning (not failure) when unable to extract title from -compliance-as-code rule.yml - -* "oscal-version": "1.0.2" - -* Fix code smell. - -* Do not emit parameters in the case of "by-control". - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`c869f37`](https://github.com/oscal-compass/compliance-trestle/commit/c869f37f9c942dc151ac729a6fa3506c375c9da7)) +* remove use of extraneous constants -### Unknown +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* Merge pull request #1102 from IBM/develop +--------- -chore: Trestle Stable Release OSCAL 1.0.2 ([`ca23972`](https://github.com/oscal-compass/compliance-trestle/commit/ca239723e0cb51f64d44a86c7b0d4fc98828d13e)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +--------- -## v0.37.0 (2022-04-12) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +Co-authored-by: semantic-release <semantic-release> -### Chore +* remove extraneous workflow lines of code (#1555) -* chore: Merge back version tags and changelog into develop. ([`0850d21`](https://github.com/oscal-compass/compliance-trestle/commit/0850d21a38ac26e2c250c3fded5f5aca7a5e736d)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Documentation +* Improve comments in new schema pre-processing module -* docs: small fixes to cli.md (#1091) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* minor doc fixes - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* spreadsheet typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`6206869`](https://github.com/oscal-compass/compliance-trestle/commit/6206869f12a16150fccb652896c1743add1a8c59)) +* upgrade cmarkgfm version -### Feature +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: bump feature with added docs (#1092) +* cmarkgfm==0.8.* -* updated doc - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final update - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`d1cdad3`](https://github.com/oscal-compass/compliance-trestle/commit/d1cdad3360a122cfa9bcd7ea8c3252369966f49e)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Fix +* trestle version should not be updated by hand! -* fix: Cherry pick all fixes from the prerelease hotfix branch (#1090) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`06e1470`](https://github.com/oscal-compass/compliance-trestle/commit/06e147088ec0808bd04f7a5f4a10dc1f13bb7275)) +* cmarkgfm==0.6.* -* fix: Improved filtering column matching. (#1082) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* Improved filtering column matching. - -* Fix lint. - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`712822e`](https://github.com/oscal-compass/compliance-trestle/commit/712822e387c592f667a763ede6f145590a9b088e)) +* remove 1.1.2 from dir name & use tmp folder for fixup schemas -### Unknown +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* Merge pull request #1093 from IBM/develop +* cmarkgfm==0.8.* works locally... -chore: Trestle Stable Release OSCAL 1.0.0 ([`0c09ed9`](https://github.com/oscal-compass/compliance-trestle/commit/0c09ed9cbae909a2e833335f06684b60540f01b5)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +* cmarkgfm==2024.1.* works locally -## v0.36.0 (2022-04-04) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Chore +* pydantic >= 2.0.0 -* chore: Merge back version tags and changelog into develop. ([`acf1143`](https://github.com/oscal-compass/compliance-trestle/commit/acf11432fe455474425cf7245bfe55b85294cad7)) +* remove extraneous optional specifications -### Documentation +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* docs: update ssp and profile authoring document (#1075) +--------- -* fixed issue with cat-assem overwrite when same - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed pro assem when no change - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed ssp assem - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed doc names - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* initial update - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final doc changes ssp - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`4211529`](https://github.com/oscal-compass/compliance-trestle/commit/42115298bb835885eb6662d8dabfcd68e05b1f59)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +Co-authored-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`82caf5f`](https://github.com/oscal-compass/compliance-trestle/commit/82caf5fe08796e10532410299d2032b2be7e7d61)) -### Feature +### Fix -* feat: Add ability to generate multiple markdown files using Jinja (#1077) +* fix: reverting last serm ver changes -* Add ability to generate multiple markdown files with sections - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Add docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Add more tests - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Use sorted id flow - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`f41fc9f`](https://github.com/oscal-compass/compliance-trestle/commit/f41fc9fe3df95985f50ef29e09be07962fc8a7e9)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`9df0703`](https://github.com/oscal-compass/compliance-trestle/commit/9df0703aa925af836a8e07dcb45ed6db31daae11)) -### Fix +* fix: revert sem release changelog and version -* fix: profile tools now handle choice and label properly (#1078) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`01427df`](https://github.com/oscal-compass/compliance-trestle/commit/01427df909cb8e3a25d46ba8e3c9049533d65a6b)) -* fixed loops - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added text for second column - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* choice update working now - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed unneeded check - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`4d9363a`](https://github.com/oscal-compass/compliance-trestle/commit/4d9363ab827cc3d26a032336b35a50feec9a59ad)) +* fix: correct sonar quality checks (#1568) -* fix: jinja control loops sort controls better (#1076) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`7f93f86`](https://github.com/oscal-compass/compliance-trestle/commit/7f93f86ac384d3c68b801a24e166fd1774c31103)) -* fixed loops - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added text for second column - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`d89128b`](https://github.com/oscal-compass/compliance-trestle/commit/d89128b83deddcd64dfab00d0a7ddcabe8415349)) +* fix: remove obsolete text, fix broken links, fix spelling (#1565) -* fix: catalog name confusion and overwrite of same assembled files (#1074) +* fix: remove obsolete text, fix broken links, fix spelling -* fixed issue with cat-assem overwrite when same - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed pro assem when no change - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed ssp assem - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed doc names - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed review requests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`1ba9a35`](https://github.com/oscal-compass/compliance-trestle/commit/1ba9a35dee356e3b8df0fedbad30d9a420fa4e79)) +Signed-off-by: semantic-release (via Github actions) <semantic-release@github-actions> -* fix: trestle transformation tasks naming convention. (#1071) +* fix: revised important note -* Rename cis-to ... ocp4-cis-profile-to-catalog,cd - -* component-definition - -* oscal-profile-to-osco-profile - -* docs - -* fix bug + 100% code coverage for ocp4-catalog - -* tanium-report-to-oscal-ar - -* docs - -* Legacy. - -* Update test name. - -* OSCO result + Tanium result fixes. - -* Fix missed re-names. - -* Simplify tests. - -* Remove logger.error - -* Fix Code Smells. - -* Fix code smells. - -* paths constants - -Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`d179d78`](https://github.com/oscal-compass/compliance-trestle/commit/d179d78671f2926c1651ad1eaa8f906f8c2aaefb)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: delay choice subst (#1072) +* make mdformat happy. -* first attempt - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* param choice subst works - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* better handling of setparams and ssp table - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* ssp_io coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* more realistic names - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* cleaned up choices and moustaches - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* choice sub happens at last stage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* update docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* add new profile - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed smell - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`16cf5e4`](https://github.com/oscal-compass/compliance-trestle/commit/16cf5e4374ce5f304cd491d1dc1e30de07e6a293)) +Signed-off-by: Lou Degenaro <lou.degenaro@gmail.com> -* fix: param choice substitution works properly (#1070) +--------- -* first attempt - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* param choice subst works - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* better handling of setparams and ssp table - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* ssp_io coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* more realistic names - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* cleaned up choices and moustaches - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`181f586`](https://github.com/oscal-compass/compliance-trestle/commit/181f58697ef18b114dd339e0ac903ee52bfa6c97)) +Signed-off-by: semantic-release (via Github actions) <semantic-release@github-actions> +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +Signed-off-by: Lou Degenaro <lou.degenaro@gmail.com> +Co-authored-by: semantic-release (via Github actions) <semantic-release@github-actions> ([`0955b4b`](https://github.com/oscal-compass/compliance-trestle/commit/0955b4b23537ea7d19d3902a7ff9e7c7e442a135)) -* fix: use set-parms of CD ctl-impl for alternatives; discard catalog hack (#1068) +* fix: BREAKING CHANGE (#1560) -* fix: use set-parms of CD ctl-impl for alternatives; discard catalog hack - -* Oops, misc. debug junk to be removed. - -* Improve function descriptions. - -* Various fixes. - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`d9e75e7`](https://github.com/oscal-compass/compliance-trestle/commit/d9e75e78b53851232adc635eca4f224e4c05d81a)) +* fix: BREAKING CHANGE -* fix: Fix Jinja dependency version (#1069) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Fix Jinja version - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Add init file - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* added comment to config.ini - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added keep_cwds - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added root info output - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated setup.cfg - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed brackets - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* again - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* setup requires - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* latest setuptools_scm - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* limit setuptools - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* limit both - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* try again - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* try explicit ini - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added .md - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* again - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added jinja - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added more - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* now use latest setuptools and setuptools_scm - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Frank Suits <frankst@au1.ibm.com> ([`34c703a`](https://github.com/oscal-compass/compliance-trestle/commit/34c703abca210c9e2c2d4675822119214f1bf3e5)) +* fix: BREAKING CHANGE -* fix: added methods in catalog interface to sort controls by sort-id (#1067) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* provide sort by sort-id when using catalog_interface - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed doc string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`dd04292`](https://github.com/oscal-compass/compliance-trestle/commit/dd04292d41090fb951b5a6284356e41c6a07d62a)) +* fix: correct wording -* fix: lock oscal to release-1.0.0 (#1065) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* point nist-source to release 1.0 - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* lock oscal to 1.0.1 patch - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* now at v1.0.0 - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated nist-content to tags/v1.0.0 - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* moved nist-source again - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`1e6b554`](https://github.com/oscal-compass/compliance-trestle/commit/1e6b5547ed53b82e45f0c9478cc91970c8980d29)) +--------- -### Unknown +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`f714b12`](https://github.com/oscal-compass/compliance-trestle/commit/f714b12d179a2e83f9ef4c1904668a67ed936c3f)) -* Merge pull request #1080 from IBM/develop +* fix: zoom link (#1530) -chore: Trestle Beta Release ([`8859463`](https://github.com/oscal-compass/compliance-trestle/commit/885946305b750bc96117915f420f74f24873ab6b)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`95ff6b7`](https://github.com/oscal-compass/compliance-trestle/commit/95ff6b7f53ab325ec106c47d28a44f5e70f5f964)) +### Unknown -## v0.35.0 (2022-03-22) +* Merge pull request #1567 from oscal-compass/develop -### Chore +chore: Trestle release ([`c8be4ab`](https://github.com/oscal-compass/compliance-trestle/commit/c8be4ab948db048c8e3802b890abedc7de8733bc)) -* chore: remove catalog_helper and use functionality in catalog_interface (#1061) +## v2.6.1 (2024-02-22) -* moved validator_helper to model_utils - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* changed doc string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* docs validate - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* initial removal of catalog_helper - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed cat_helper - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* docs validate - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed tg - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed bad loop references - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`4a60a20`](https://github.com/oscal-compass/compliance-trestle/commit/4a60a2037698e0c796b598557a5bdd94d0293e4e)) +### Chore -* chore: move val helper (#1060) +* chore: Merge back version tags and changelog into develop. ([`11fbcda`](https://github.com/oscal-compass/compliance-trestle/commit/11fbcdaeb1173ba131c20df6ba5be66bfc997b23)) -* moved validator_helper to model_utils - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* changed doc string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* docs validate - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed unneeded TG - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`8864d5d`](https://github.com/oscal-compass/compliance-trestle/commit/8864d5d41da388363e4d8b58f2ecf80cb8415bb3)) +### Fix -* chore: Remove error duplicates and standarize exceptions part 2 (#1058) +* fix: correct vuln for cryptography (#1520) -* Remove the rest of logger errors - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Remove useless debug line - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Remove more duplicated logs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Change debug logs to trace - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Small change - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`484de2c`](https://github.com/oscal-compass/compliance-trestle/commit/484de2cb2f0957bcf062eb143dd8791a08e8a55e)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`353cc2b`](https://github.com/oscal-compass/compliance-trestle/commit/353cc2b75e611b9d851cca2022f4e0fbe2936d16)) -* chore: Remove error duplicates and standarize exceptions (part 1) (#1052) +### Unknown -* chore: Example of logging and exception handling - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Convert more files to the common structure - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* More changes - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`4f92845`](https://github.com/oscal-compass/compliance-trestle/commit/4f928451e7a3a44d9e240627ce1cdf9056304503)) - -* chore: Optimize images (#1054) +* Merge pull request #1521 from oscal-compass/develop -/docs/tutorials/ssp_profile_catalog_authoring/trestle_ssp_author_options.png -- 55.51kb -> 44.47kb (19.9%) - -Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com> - -Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`85bfd94`](https://github.com/oscal-compass/compliance-trestle/commit/85bfd941213dc8ecaa389ff2150a5e2be62b30d9)) +chore: Trestle release ([`f097029`](https://github.com/oscal-compass/compliance-trestle/commit/f097029392963643932f471dbc7c1e6baec91896)) -* chore: increase coverage and remove checks for dict that arent needed after OSCAL 1.0.0 (#1039) +## v2.6.0 (2024-02-22) -* initial cleanup of dicts - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* attempt fix for 3.7 - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* responded to pr change requests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`e84855e`](https://github.com/oscal-compass/compliance-trestle/commit/e84855e160e730991f7d85ae57baf5c42fca4e56)) +### Chore -* chore: Refactor utils and split common functionality into logical parts (#1000) +* chore: Merge back version tags and changelog into develop. ([`6b2412e`](https://github.com/oscal-compass/compliance-trestle/commit/6b2412e7e0e34fdc32a5e1af06c3bdc46a7687e8)) -* chore: Refactor utils - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Update docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Change imports - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Fix test import - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Rename utils - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Update docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Address feedback - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`4fb833d`](https://github.com/oscal-compass/compliance-trestle/commit/4fb833df34129498894e36c00210aa7fd001719a)) +### Feature -* chore: Merge back version tags and changelog into develop. ([`38492fa`](https://github.com/oscal-compass/compliance-trestle/commit/38492fae9b7ea921857457d34348a8d448b8d6df)) +* feat: multiple parms per rule (#1499) -### Documentation +* feat: multiple parameters per rule -* docs: ssp tutorial update (#1034) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* updated ssp authoring tutorial - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added comment - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed review requests to clarify docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final doc tweaks - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* force flake8 not to run parallel - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* jobs set to 1 in setup.cfg - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* jobs=1 in makefile - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* edited yaml - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweaked yaml - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* disabled flake8-bandit, updated ssp docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`12ab44f`](https://github.com/oscal-compass/compliance-trestle/commit/12ab44f39a15f8de0388cf7ffab3cce44bc396cf)) +* fix: use correct columns names list -* docs: Fix typo personell->personnel. (#1014) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Signed-off-by: Alexander Stein <alexander.stein@nist.gov> ([`f3041be`](https://github.com/oscal-compass/compliance-trestle/commit/f3041beea9ea6093bc7b462521c9cff325cf9f4b)) +* fix: add test for multi-parameters per rule -### Feature +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: xlsx filter (#1050) +* fix: a bit more on parameter sets in the help -* Check for xlsx-to-profile required config vars. - -* Support for filter-column. - -* Feat/xlsx filter. - -* Fix code review items. ([`9f63412`](https://github.com/oscal-compass/compliance-trestle/commit/9f6341257f755e49173050b4d0f2e32c75874610)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: xlsx-to-oscal-profile (#1046) +* fix: code smell -* feat: xlsx-to-oscal-profile - -- create common xlsx module -- create xlsx-to-oscal-profile task -- artifacts for 100% code coverage - -* fix lint error - mkdocs - -* Relocate xlsx_helper. - -* Refactor common code. - -* Refactor. - -* Refactor. - -* Code smell. - -* Code smells. - -* Use "public" URL in test data. - -* Fix: year is 2022 in code copyright. - -* fix: list_utils is_ordered_sublist - -* Ugh. lint. - -* Update cli.md with new changed task name. - -* Add xlsx-to-oscal-profile to cli.md. - -* Tweak. - -* Ugh. mdformat. - -* Reduce duplicate code. ([`9695933`](https://github.com/oscal-compass/compliance-trestle/commit/96959339818baaa06b0a9c00dedae81c9c99dcec)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: Resolve UUID Imports During Profile Resolution, Not Only Explicit Imports (#1023) +* fix: test for modification to additional parameter set value -* feat: Resolve import uuid anchor during profile resolution. - -Signed-off-by: Alexander Stein <alexander.stein@nist.gov> - -* feat: Add profile resolv docs - -And of course reach to the two commit minimum for the PR. :-) - -Signed-off-by: Alexander Stein <alexander.stein@nist.gov> - -* feat: Check for missing resources pre-assignment - -Tests wisely indicate that a profile.back_matter, can have a falsey None -value for resources and there should a conditional assignment test before -to ensure that. - -Signed-off-by: Alexander Stein <alexander.stein@nist.gov> - -* feat: Add with @fsuit's feedback. - -Signed-off-by: Alexander Stein <alexander.stein@nist.gov> ([`ae803e7`](https://github.com/oscal-compass/compliance-trestle/commit/ae803e74cda58694a294ccfe1e979f2993626ec8)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: aggregate properties as results level (#997) +* fix: test for delete of additional param set -* feat: aggregate properties as results level - -* fix code smell. - -* Generalize common property removal from observations. - -* Use @classmethod annotation. - -* Undo @classmethod annotation. - -* mkdocs - -* Tanium - result per local definition with aggregate properties. - -* Use if x: rather than if len(x) > 0: for most circumstances. - -* Handle empty local-definitions. - -* List comprehension. - -* Employ set intersection. - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`174aabe`](https://github.com/oscal-compass/compliance-trestle/commit/174aabe401b9fbe35a10efcc9df159a3537d3c0d)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: Validate OSCAL directories (#990) +--------- -* feat: Validate OSCAL directories - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Add yaml extension - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Clean up tests - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Make keep files hidden on windows - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Make keep files hidden on windows - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Address feedback - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Address review feedback - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Typo - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`941e4fc`](https://github.com/oscal-compass/compliance-trestle/commit/941e4fc6fe9e3c4700f4f7c43be849fb176fb57d)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`218ffe4`](https://github.com/oscal-compass/compliance-trestle/commit/218ffe47a879e8bbca115bd956cfc9e99bbc5751)) ### Fix -* fix: use control sort-id for sorting (#1062) +* fix: add multiple parameters per rule support on component definition (#1504) -* implemented sort-id - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* no cover as needed - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* clarified sub name - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed iterations - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* consistent handling of sort-id - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`fb65bfb`](https://github.com/oscal-compass/compliance-trestle/commit/fb65bfbaadca2240f535d7db057baed108ec0bf2)) +* fix: add multiple parameters per rule in component definition -* fix: task tanium-to-oscal poor aggregation performance (#1053) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: task tanium-to-oscal poor aggregation performance - -* Ugh. docs. - -* Fix review items for cache.py - -* Fix for comments on list_utils.py - -* Fix review items for tanium.py - -* Improve aggregation performance. - -* Remove obsolete code. - -* Docs. - -* Types. - -* Add test for list_utils and fix bug! - -* Improve function name and test. - -* Add unit tests for transformer helper. - -* Skip accounting when not needed. - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`9ea118c`](https://github.com/oscal-compass/compliance-trestle/commit/9ea118c472b83491a30bbeabe35afbc35fd4e96d)) +* fix: correct code linting errors -* fix: avoid write of new file if no changes after -assemble (#1057) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* update timestamps - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* profile assemble write only on change - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* no overwrite ssp assemble - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* cleaned up ssp overwrite - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed transform tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* all write on assemble will check for change - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* modified docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed typing - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* changed to last_modified - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`893eec6`](https://github.com/oscal-compass/compliance-trestle/commit/893eec6afcf6eaaa9f831528995de267a0cabe6b)) +* fix: adding more testing -* fix: update timestamps for all assemble tools (#1056) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* update timestamps - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* handle last_modified missing - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`cccd7a2`](https://github.com/oscal-compass/compliance-trestle/commit/cccd7a2e9399bf001ab101a405f370d92c1d000c)) +* fix: add a value for the rule parameter in tests -* fix: flake8 bandit reenable, remove transformcmd, empty config.ini (#1055) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* enabled flake8-orbit and emptied config.ini - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed xform cmd - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* disable password check in cache.py - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* try again - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* noqa on correct lines - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* reran mkdocs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a7543c2`](https://github.com/oscal-compass/compliance-trestle/commit/a7543c24c80b6904a27a678aff3bce357fc44629)) +* fix: correct tests and add code for dup components validation -* fix: more complete parameter info in yaml headers (#1049) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* added param_to_dict and reverse - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed tests with full parameter - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed smell - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* params without values also output by default - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* reworked profile assemble setparams - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweaked help string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* redid using profile-values - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed dead code and updated docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed ohv - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`7a3b098`](https://github.com/oscal-compass/compliance-trestle/commit/7a3b098d2ef9f88f564908927240524021d5c768)) +* fix: correct quality gate error -* fix: block withdrawn controls from being written as markdown (#1045) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* updated ssp authoring tutorial - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added comment - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed review requests to clarify docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final doc tweaks - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* force flake8 not to run parallel - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* jobs set to 1 in setup.cfg - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* jobs=1 in makefile - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* edited yaml - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweaked yaml - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* disabled flake8-bandit, updated ssp docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* initial move of add as part of create command - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docstrings - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed add test docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* clarified json yaml in add - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* dont write out withdrawn controls - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* more doc strings - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* lowercase check for withdrawn - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added function to remove withdrawn controls from catalog - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`053ab0e`](https://github.com/oscal-compass/compliance-trestle/commit/053ab0eac098104ed062acb80b4b65f419d37323)) +* fix: correct typo and fix test description -* fix: remove add command and incorporate it into the create command (#1036) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* updated ssp authoring tutorial - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added comment - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed review requests to clarify docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final doc tweaks - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* force flake8 not to run parallel - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* jobs set to 1 in setup.cfg - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* jobs=1 in makefile - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* edited yaml - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweaked yaml - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* disabled flake8-bandit, updated ssp docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* initial move of add as part of create command - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docstrings - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed add test docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* clarified json yaml in add - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* more fixes of docs after moving add to create - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed mdformat - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* typos - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`ddde5f5`](https://github.com/oscal-compass/compliance-trestle/commit/ddde5f537158f5621f3d5d0a06791400076d4a4f)) +* fix: correct typo -* fix: Improve column heading matching. (#1035) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Improve column heading matching. - -* Spelling fixes. - -* Standardize task name and remove extraneous typing. - -* Fix code-format. - -* Fix docs. - -* Reduce code smells. - -* Fix code smells. - -* Fix code smells. - -* Fix code smells. - -* Fix code smells. - -* Fix code smells. - -* Fix code smells. - -* Fix code smells. ([`a51fa1e`](https://github.com/oscal-compass/compliance-trestle/commit/a51fa1e9a953dd84e88c344b4d8368d90e9cea41)) +--------- -* fix: improve sections (#1033) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`96e3f02`](https://github.com/oscal-compass/compliance-trestle/commit/96e3f02fc597ded59ed11f5bd2b07aa2c0ccb504)) -* normalized commands and added required-sections - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improve handling of sections_dict - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* sections better and fixed args issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* ready to prompt for params - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* required sections working - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added allowed sections - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* address PR change requests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* trestle_root should be path - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`8e6c632`](https://github.com/oscal-compass/compliance-trestle/commit/8e6c632237747e6e75cf24886418438a25ae46f1)) +* fix: community call (#1516) -* fix: consistent author commands and support for required-sections (#1030) +* fix: update community call information -* normalized commands and added required-sections - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improve handling of sections_dict - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`08953d1`](https://github.com/oscal-compass/compliance-trestle/commit/08953d19a2144f98051b33917eca534521de115c)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: profile params (#1015) +* fix: removing unneded separators -* updated docs and abstracted string formatting of params - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added param_id - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed param_id - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added comments - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* more control over parameter formatting - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* minor bug - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage and enabled cat assemble into orig catalog - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* converted preserve_header_values to overwrite_header_values - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addresed review questions - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`30c0ec1`](https://github.com/oscal-compass/compliance-trestle/commit/30c0ec1097140c9e88bc43f46a2ccc7a1273f81e)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: 2 bugs xlsx-to-oscal-component-definition (#1017) ([`81d4bf2`](https://github.com/oscal-compass/compliance-trestle/commit/81d4bf2682dacaba3ee09061a790e8a2c15564a4)) +* fix: community meetings -* fix: updated documentation for trestle (#1006) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: updated documentation for trestle - -* fix: updated documentation - -Co-authored-by: Vikas <avikas@in.ibm.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`8d3187d`](https://github.com/oscal-compass/compliance-trestle/commit/8d3187dd27cbf2fec0eab787bf6b19ddceebf519)) +* fix: agenda and notes -* fix: missing params in generated catalog and better hidden file handling on windows (#999) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* initial cleanup - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed missing params in catalogs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* setting param values rather than label - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`c4550f5`](https://github.com/oscal-compass/compliance-trestle/commit/c4550f541c53327bac3ad38f1feaf262d0b9be27)) +* fix: use every other Tue.; add login notes & calendar link -* fix: Second stage code cleanup and dead code removal (#993) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* reverted utils change - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final cleanup - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed pr review changes - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`79b2f61`](https://github.com/oscal-compass/compliance-trestle/commit/79b2f61baac7adbf69e1474a5e218d664bec65ff)) +* fix: make mdformat happy. -* fix: cleanup phase I including split of profile_resolver (#991) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* initial cleanup including prof resolver split - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed parse_file - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* function to query verbosity - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* cleaned up repository - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* as_list and prof resolver - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated mkdocs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* address pr feedback and more cleanup - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* regen of docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* made log calls private - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`39134aa`](https://github.com/oscal-compass/compliance-trestle/commit/39134aad2ee55e60a89f59c691dc145008b77206)) +* fix: update calendar info -* fix: allow trace logging with verbose level 2 (#989) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* initial version of trace logging - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added example - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`7b4b349`](https://github.com/oscal-compass/compliance-trestle/commit/7b4b34955020ff5f2608c0f9af84520f45cb86f7)) +* fix: add a passcode to zoom meeting -* fix: README documentation improvements (#987) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* Remove redundant dot - -Signed-off-by: Guy Zylberberg <guyzyl@gmail.com> - -* Add pip install command line - -Signed-off-by: Guy Zylberberg <guyzyl@gmail.com> - -* Grammer improvements - -Signed-off-by: Guy Zylberberg <guyzyl@gmail.com> - -* Add reference to Python installation guide - -Signed-off-by: Guy Zylberberg <guyzyl@gmail.com> ([`0ad4996`](https://github.com/oscal-compass/compliance-trestle/commit/0ad499611c3fd6a0c0e8dc258bb1dd8190e4bfba)) +* fix: correct wording for zoom login -* fix: change verbose assignments from boolean to integer (#988) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* added link to trestle ssp demo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* did pre-commit properly - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`6aed714`](https://github.com/oscal-compass/compliance-trestle/commit/6aed7142334af6ee97345248224d05de875eae12)) +* fix: correct format check -### Unknown +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* Merge pull request #1064 from IBM/develop +* fix: rephrase login options -chore: Trestle release ([`79d828e`](https://github.com/oscal-compass/compliance-trestle/commit/79d828e96f6a721bdc55eadd02247277a579a750)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* Optimize images (#1038) +--------- -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> -Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> ([`9ccce98`](https://github.com/oscal-compass/compliance-trestle/commit/9ccce98ff03b535f7ea3dc6790e05cd5b310c9bc)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +Co-authored-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`53d7fd4`](https://github.com/oscal-compass/compliance-trestle/commit/53d7fd484bdd42e22ff58e3244da732835c2cfea)) +* fix: correct vulnerability (#1509) -## v0.34.0 (2022-01-07) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +Co-authored-by: mrgadgil <49280244+mrgadgil@users.noreply.github.com> ([`4f70e0a`](https://github.com/oscal-compass/compliance-trestle/commit/4f70e0af0e4063ac3cd763ff0c7e319168c0d805)) -### Chore +* fix: add check for empty label to fix failure for statement with no label property (#1507) -* chore: Merge back version tags and changelog into develop. ([`496973a`](https://github.com/oscal-compass/compliance-trestle/commit/496973afeb1c3bfa697bf1fa4705764008ffd8d8)) +* test: adds test for ssp assemble with fedramp profile -### Documentation +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* docs: update ssp workflow and minor changes to other docs (#985) +* fix: adds fix for parts with no label during ssp-assemble -* updated ssp docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* additional edits and validation of docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`45be184`](https://github.com/oscal-compass/compliance-trestle/commit/45be1842d1fdc634d8ae9b5b404da4e59ea13d18)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Feature +* fix: don't put empty label into map -* feat: Add custom parameter wrapping to jinja (#976) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: Add custom parameter wrapping to jinja - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Fix docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Address feedback - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`4289ca0`](https://github.com/oscal-compass/compliance-trestle/commit/4289ca0bd1cac83146a4f9080e0eb7f766d78db3)) +* fix: make sonar happy -> reduce complexity -* feat: add jinja datestamp output (#970) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: add jinja datestamp output - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* update doc formatting - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* fix deprecation warning for number captions regex - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* mdformat for docs addition - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* add tests for md datestamp - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* add test case for invalid jinja tag - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* use const for datestamp format string - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* update docs for new datestamp format - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> -Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> ([`2b92da1`](https://github.com/oscal-compass/compliance-trestle/commit/2b92da100f0646dabf3a56a6544dd72bc66c4958)) +--------- -* feat: add optional numbering of figures and tables when generating md… (#964) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +Co-authored-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`55ed462`](https://github.com/oscal-compass/compliance-trestle/commit/55ed462107d577efc9099b8ed59c5718eee9e47c)) -* feat: add optional numbering of figures and tables when generating md ssp using jinja - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* fix lint errors - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* add tests for number caption & bug fix - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> -Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> ([`89bafe7`](https://github.com/oscal-compass/compliance-trestle/commit/89bafe7f1fcfe3fe1db4900be483f8416fb824b7)) +### Unknown -### Fix +* Merge pull request #1519 from oscal-compass/develop -* fix: OCP4 CIS Component Definition rules should have unique descriptions (#975) +chore: Trestle release ([`1987260`](https://github.com/oscal-compass/compliance-trestle/commit/198726001c6ea1911b11c1757f219eca032a46ad)) -* fix: OCP4 CIS Component Definition rules should have unique descriptions - -* Use consistent json format for selected & enabled rules. - -* Revise tutorial: use 3 selected rules to reduce comp-def.json size. - -* Use https. - -* Add types to parameters and return value of method _get_title. - -* Add detailed operational description to method _get_title. - -Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`299db5a`](https://github.com/oscal-compass/compliance-trestle/commit/299db5acffe3f247cba86382a873cc1029b45ded)) +## v2.5.1 (2024-01-18) -* fix: better handling of groups containing groups in ssp gen and assemble (#977) +### Chore -* added test and json files - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final fixes of recursive group handling - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage and changed recurse to mean recurse within controls only - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`5fa1820`](https://github.com/oscal-compass/compliance-trestle/commit/5fa18203d89ff353f8500f892b85b957385ebb11)) +* chore: Merge back version tags and changelog into develop. ([`64c819a`](https://github.com/oscal-compass/compliance-trestle/commit/64c819a3b76acb3fb06396afc1f7fe2897ec1dab)) -* fix: several issues in profile assemble and catalog generate (#974) +### Fix -* fixed several bugs in profile and catalog - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* doc string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved doc strings and cleaned up namings - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`0435c84`](https://github.com/oscal-compass/compliance-trestle/commit/0435c8405e4ff1b6608ec93fb3baafb61356d1d8)) +* fix: correct security vulnerability (#1498) -* fix: fix json blocks in md so mdformat doesnt raise cannot format warning (#973) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`e23792c`](https://github.com/oscal-compass/compliance-trestle/commit/e23792cb1cde490fa2951866c9f99f9d43e9c669)) -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> ([`73b0612`](https://github.com/oscal-compass/compliance-trestle/commit/73b061275e101c19e34a45fa5ab959b1f29f6293)) +### Unknown -* fix: add toml as yapf pre-commit dependency (#972) +* Merge pull request #1501 from oscal-compass/develop -* fix: add toml as yapf pre-commit dependency - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* fix: Add yapf extra dependency - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> -Co-authored-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`d026282`](https://github.com/oscal-compass/compliance-trestle/commit/d0262826f30e0c7f89f8a3551b93142669fa2c66)) +chore: Trestle release ([`7966956`](https://github.com/oscal-compass/compliance-trestle/commit/79669569572b8777c3ef1b1b6663c99af4002bff)) -* fix: fix blind link in readme (#969) +## v2.5.0 (2024-01-05) -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> -Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> ([`3f054bd`](https://github.com/oscal-compass/compliance-trestle/commit/3f054bd8d82032371955627023ceb257e2f3d4f6)) +### Chore -* fix: Handle error when dealing with profiles with no modify object. (#963) +* chore: Merge back version tags and changelog into develop. ([`5ac3067`](https://github.com/oscal-compass/compliance-trestle/commit/5ac3067ad2e81eb3b0d31f2d3f05a12b44ec1072)) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`7ad3c82`](https://github.com/oscal-compass/compliance-trestle/commit/7ad3c82058991507808580e800f0bc9df16d2071)) +### Feature -### Unknown +* feat: add parameter value origin field to parameters (#1470) -* Merge pull request #986 from IBM/develop +* feat: add parameter value origin field to parameters -chore: Trestle release ([`03ca23e`](https://github.com/oscal-compass/compliance-trestle/commit/03ca23eccf7d5086c47eeaf81a1fd8ef154d1861)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +* fix: remove wrong added field from oscal model -## v0.33.0 (2021-12-21) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Chore +* fix: add param_value_origin to props and add validations -* chore: custom pruning for a smaller catalog but preserving controls ac-1 through -5 (#953) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat: custom pruning for a smaller catalog but preserving controls ac-1 through ac-5. -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* added full controls and hooked into all existing tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Frank Suits <frankst@au1.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`4099d48`](https://github.com/oscal-compass/compliance-trestle/commit/4099d48e5e289367eed588bd70ff9d6f8d90ee35)) +* fix: correct ci -* chore: Merge back version tags and changelog into develop. ([`4db0a04`](https://github.com/oscal-compass/compliance-trestle/commit/4db0a047e290437ff09c7c54072494af15eef191)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Feature +* fix: correct param value origin cycle -* feat: Support for SSP writing with jinja templating. (#787) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Committing to change priorities. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Demonstration of jinja extensions allowing processing of oscal fields. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Added example on jinja if tags - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: Add Jinja markdown filters - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: Adding jinja transform command - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Lazy stashing. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: updated signatures - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: Adding kwarg to allow jinja templates to adjust header level - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Add ssp io (#938) - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Fix control response - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Corrected mdtags to use kwargs properly - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Adjust control response - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Remove extra test data - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Fix test name - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Small adjustment - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Working ssp templating - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: adding missing test files. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Print response for this system - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Minor edits - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: CICD Cleanups (#943) - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Adjust tables and headers (#944) - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Correcting tables in ssp_io - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: fix attribute error in catalog_interface (#946) - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* chore: Fix tests and tables - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Add more tests - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Small fix - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: documentation for the jinja command. (#948) - -* fix: Added jinja cmd documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Revising docs based on PR feedback. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: More tests - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: add trailing newlines to md front_matter content (#956) - -fixes format issue in pandoc docx conversion of front matter, where the header of the following section is included in the previous paragraph if there is no trailing newline in the markdown file of the previous paragraph. - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* fix: Removed extra unnessary unit tests and unneeded code. (#959) - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Add Jinja (#958) - -* chore: Add jinja tests - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Address review feedback - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Address feedback - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Small fix - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Fix tests - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Small enchancement - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: update control title format for ssp output (#960) - -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> - -Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> - -* chore: Adjust title in ssp - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Co-authored-by: Ekaterina Nikonova <enikonovad@gmail.com> -Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> -Co-authored-by: D9 <dougchivers@gmail.com> -Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> ([`e47fc77`](https://github.com/oscal-compass/compliance-trestle/commit/e47fc778ab66a8997b689753ce5ead1849543e52)) +* fix: correct profile-param-value-origin flow -### Fix +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: merge dicts and remove transform command from CLI until mature.(#954) +* fix: adding final corrections and test for inherited param-value-origin -* initial changes to ssp docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* reworked merge and fixed tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixes for cidd-script - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`82e484b`](https://github.com/oscal-compass/compliance-trestle/commit/82e484b59a4415c2ece1fda55b2b7e9f1a46ab68)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Unknown +* fix: correct formating -* Merge pull request #961 from IBM/develop +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -chore: Trestle release ([`1874b18`](https://github.com/oscal-compass/compliance-trestle/commit/1874b1800d74f4997296b3343abdbe6d98a8ba6e)) +* fix: add step to ignore param-value-origin if no replacement was done in profile-param-value-origin +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -## v0.32.1 (2021-12-17) +* fix: correct code format -### Chore +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Merge back version tags and changelog into develop. ([`0f808d1`](https://github.com/oscal-compass/compliance-trestle/commit/0f808d14e59d789dd0f634fab03a2a5a7f265d85)) +* fix: correct tests -### Fix +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: cidd issues (#949) +* fix: use replace me placeholder instead of literal text -* fixed file encoding issue and changed signature of get_group_id - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added doc string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`038ca2e`](https://github.com/oscal-compass/compliance-trestle/commit/038ca2ec96a6d85aa891d0cf36e9f9c03e0733d7)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: OSCO rules with prefix ocp- and dashes (#932) +* fix: use replace me tag in default value for param-value-origin -* fix: OSCO rules with prefix ocp- and dashes - -* Produce customized yaml based on "profile_check_version". - -* Simplify. - -* Fix code smell. - -* Add info note. - -* Expect metadata property profile_osco_version to customize emitted yaml. - -* Remove unnecessary typing. - -* Use non-empty href in profiles. - -* Simplify by using as_list function. - -* Simplify, use tuples. - -* Simplify, use tuples. (sneak in) - -* Emit description for OSCO version >= 0.1.40. - -* Several changes: - -- Remove flag profile_check_version. Always emit parameters if given. -- Don't add ocp4- prefix if its already there. -- Revise -i text accordingly. -- Revise unit tests accordingly. - -* Flag name "osco_version". - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`64f7a97`](https://github.com/oscal-compass/compliance-trestle/commit/64f7a973f5bb7c7946b789770034da186dbcd77e)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Unknown +* fix: correct code format -* Merge pull request #957 from IBM/develop +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -chore: Trestle Release ([`5bccc2c`](https://github.com/oscal-compass/compliance-trestle/commit/5bccc2cf8df53db5de00eabb57b518cf9f81025f)) +--------- +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`b86aa2b`](https://github.com/oscal-compass/compliance-trestle/commit/b86aa2b5ef97a8fd988efb8ec995fb0624af6db0)) -## v0.32.0 (2021-12-14) +* feat: allow use of OpenSCAP result files in task xccdf_result_to_oscal_ar (#1411) -### Chore +* feat: Allow use of OpenSCAP result files in task xccdf_result_to_oscal_ar -* chore: Remove simulate from Plan (#916) +Before this commit if you wanted to use result files from OpenSCAP +in the task xccdf_result_to_oscal_ar you had to extract the +`TestResult` element and place it as the root of the XML +document, otherwise the resulting OSCAL document would be +blank. Thus making it impossible to directly use output from +OpenSCAP with the task. -* chore: Remove simulate - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Rollback changes - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`221471d`](https://github.com/oscal-compass/compliance-trestle/commit/221471d9773e26ddcb176ec24ef849325739c523)) +With this commit the task will detect that the root element +is not `TestResult` and then it will find the `TestResult` +element in the XML document. This allows the use of files +created by OpenSCAP using the `--results` and `--results-arf` +switches. -* chore: Standarize return codes (#888) +Signed-off-by: Matthew Burket <mburket@redhat.com> -* chore: Standarize return codes - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Move exception catch - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Decrease test cov for now - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Adjust tests - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Remove exception coverage - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Increase coverage - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Increase coverage - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`6b376e3`](https://github.com/oscal-compass/compliance-trestle/commit/6b376e3e21875720ff91aaf4fef7d655d93a3514)) +* Add tests for OpenSCAP results files for task xccdf_result_to_oscal_ar_test -* chore: Merge back version tags and changelog into develop. ([`ccb0859`](https://github.com/oscal-compass/compliance-trestle/commit/ccb0859996ffbe6a9a2a589e8a98ef3de78f0faa)) +Signed-off-by: Matthew Burket <mburket@redhat.com> -### Documentation +--------- -* docs: clear edit_uri to remove edit pencil (#937) +Signed-off-by: Matthew Burket <mburket@redhat.com> ([`eeb715c`](https://github.com/oscal-compass/compliance-trestle/commit/eeb715c4cd86c3bd5183592c03beac1cc46859d9)) -* docs: clear edit_uri to remove edit pencil - -Closes: https://github.com/IBM/compliance-trestle/issues/529 - -Signed-off-by: Ryan Moats <rmoats@us.ibm.com> - -* fix: Removing incorrect flag in mkdocs.yml - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`e32c7ce`](https://github.com/oscal-compass/compliance-trestle/commit/e32c7ce46df3ff905e115ab315c36005f8e0e246)) +* feat: add inheritance view to ssp-generate and ssp-assemble (#1441) -* docs: add versioning tutorial (#917) +* feat: adds ability to process exports from SSP and write Markdown by component -* docs: add versioning tutorial - -Signed-off-by: Ryan Moats <rmoats@us.ibm.com> - -* Fix mkdocs yml mistake - -Signed-off-by: Ryan Moats <rmoats@us.ibm.com> - -* Remove default front matter - -Signed-off-by: Ryan Moats <rmoats@us.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b682806`](https://github.com/oscal-compass/compliance-trestle/commit/b682806f25783a8cc4df18647ac96973d365012d)) +Adds ExportInterface and ExportWriter classes +Adds Markdown generation to ssp-generate +Add MarkdownWriter for leveraged statements -### Feature +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> +Signed-off-by: Alex Flom <alexander.flom@gmail.com> -* feat: added documentation for fedramp plugin (#936) +* feat: adds InheritanceMarkdownReader for reading leveraged statement markdown -* feat: added documentation for fedramp plugin - -* fix: updated plugin docs - -Co-authored-by: Vikas <avikas@in.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`3deff2c`](https://github.com/oscal-compass/compliance-trestle/commit/3deff2c857c55348242e06a74f2647224517506c)) +Adds InheritanceMarkdownReader for processing into a leveraging SSP context +Adds persistance for components and satisified statements during updates +Changes leveraging component from a single dictionary to a list -* feat: params in header for profile generate and assemble (#935) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* writing profile params to header - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* clarified header_dont_merge behavior - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* profile assemble handles set_params in header - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed issue merging headers and added tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed issue with controls that just have statement - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed doc string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed typing - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed typing and doc string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix: Improved handling of line feeds in profile-assemble. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* numerous fixes - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed bugs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`a1b293f`](https://github.com/oscal-compass/compliance-trestle/commit/a1b293f8cac65d32b1cf21a22f49e02967f4e184)) +* feat: Adds reader class for inheritance markdown -* feat: tutorial cis-to-catalog (#931) +Adds ExportReader class +Removes ExportInterface class +Adds a single ByComponentInterface class to interact with the model +in terms of inheritance -* feat: tutorial cis-to-catalog - -* fix: removed unneeded escaped double quotes. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: removed unneeded escaped double quotes. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Added missing reference file. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`e2842a8`](https://github.com/oscal-compass/compliance-trestle/commit/e2842a8d66a261c98e973a7edf1bdddb2a342d06)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* feat: task cis-to-catalog (#911) +Co-authored-by: Jennifer Power <barnabei.jennifer@gmail.com> -* feat: task cis-to-catalog - -* Make code-format and code-lint happy. - -* Fix code smell: Exception - -* Fix code smell: ValuesView - -* Simplify class Node. - -* Oops, use pydantic BaseModel. - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`0a492d0`](https://github.com/oscal-compass/compliance-trestle/commit/0a492d01977467fb6839fbc83322149f5474bbe4)) +* docs: updates documentation with usage and API references updates for inheritance -* feat: roles in metadata (#926) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* added function to get control param dict - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed special catalog group and use empty string instead - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added doc files - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed format - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`ddc1e66`](https://github.com/oscal-compass/compliance-trestle/commit/ddc1e662ef345eaecf5b5584964d5739f1c3ab43)) +* chore: updates AgileAuthoring class for ssp-generate arg changes -* feat: allow components in markdown and ssp assemble (#902) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* adding support for header metadata - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added template - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* have bycomp working for ssp - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added doc files - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* made test less rigid - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* simplified test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* have components working properly with ssp assemble - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* handled pr feedback - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added tests and test files - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b03a236`](https://github.com/oscal-compass/compliance-trestle/commit/b03a236ad2928b384677e5777b1880d3386a4fe0)) +* docs: updates returns section in InheritanceMarkdownReader docstring -* feat: Add ability to modify headers in the tree (#909) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* feat: Add ability to modify headers in the tree - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Extra check - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Ensure tree identity - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Use better naming - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`b455c18`](https://github.com/oscal-compass/compliance-trestle/commit/b455c18c3492b7e4a4fced8b701780d109bed55e)) +* fix: updates line length on return statement in InheritanceMarkdownReader -* feat: Altering ssp-generate to add all sections by default (#905) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* feat: Altering ssp-generate to add all sections by default - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: adding extra test coverage. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`55a399b`](https://github.com/oscal-compass/compliance-trestle/commit/55a399bf129aa39e42e83e93e8b1b69aec20d9bb)) +* refactor: updates markdown heading and comment strip function to remove regex -### Fix +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: Fire off sonar only on local PRs. (#934) +* test: adds inheritance view testing for ssp-assemble -* fix: Fire off sonar only on local PRs. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Fire off sonar only on local PRs. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Update developer docs to explain sonar work around. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`26f4f0a`](https://github.com/oscal-compass/compliance-trestle/commit/26f4f0ab08af2d37c05130e3189bfa74f79b5a57)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: Ensuring that mkdocs yaml both remains stable an is up to date. (#927) +* chore: adds more context to ExportReader class comments -* fix: Correcting documentation website index. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correcting documentation website index such that it does not change again. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: adding check script to linter - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ee48763`](https://github.com/oscal-compass/compliance-trestle/commit/ee487634cbf80b3aeac12a7f103c19730b18e2da)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Unknown +* feat: updates ssp-generate to filter control implementation for leveraged_ssp -* Merge pull request #942 from IBM/develop +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -chore: Trestle release ([`57a5523`](https://github.com/oscal-compass/compliance-trestle/commit/57a55234b3d95a2b1a555333d250d77369ea96f2)) +* refactor: updates ExportWriter to reduce code duplication +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -## v0.31.0 (2021-12-01) +* fix: updates ExportReader to add new statements if present in the inheritance view -### Chore +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* chore: Increase test coverage for validation (#901) +* fix: update logging to debug in ExportReader -* feat: Add ignore files flag to the validation - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Ignore directories - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Update docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Update tests - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Add deprecate warning - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* chore: Add missing tests for validation - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`0799c37`](https://github.com/oscal-compass/compliance-trestle/commit/0799c37b7d1a5c36535d0fa71c58e1bb2f73c863)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* chore: Merge back version tags and changelog into develop. ([`1cd9894`](https://github.com/oscal-compass/compliance-trestle/commit/1cd989494b5707d15a5b593987d8071a27ddd95d)) +* refactor: simplify code in read_exports_from_markdown -### Feature +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* feat: added trestle-fedramp project discovery and command (#899) +* tests: simplify tests for ExportReader test data generation -* feat: added trestle-fedramp project discovery and command - -* fix: updated cli.py to add commands from plugins generically. Also added a CommandBase class to not check for trestle-root. - -* fix: Adding nocover statements. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Adding nocover statements. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Vikas <avikas@in.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`f0cc836`](https://github.com/oscal-compass/compliance-trestle/commit/f0cc8367a9001749a81c1a069f02ea00e49a7cec)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* feat: Ignore files from the validation (#898) +* refactor: reduce code duplication in ExportReader methods -* feat: Add ignore files flag to the validation - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Ignore directories - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Update docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Update tests - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Add deprecate warning - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`c2af814`](https://github.com/oscal-compass/compliance-trestle/commit/c2af8148cd7698bc75803bec0c4d6b181e11cd64)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* feat: Enforce OSCAL version and notify user (#895) +* fix: allows inheritance info to be removed when component is unmapped -* feat: Enforce OSCAL version - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Print only version error if present - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Add safer version error check - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: gen oscal version (#900) - -* fixed validator for gen_oscal - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed comment typo - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`246875c`](https://github.com/oscal-compass/compliance-trestle/commit/246875ce0c7d42f931072739ae340b39bbb0399e)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* feat: sample generic oscal transform to filter ssp by profile (#820) +* feat: adds leveraged authorization updates to system implementation -* initial version of trestle transform - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* enhanced - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed dead code - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* increased coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added new arg for header - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* refined command options - tests pass - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved docstrings - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* ssp assemble regenerate is working - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* clean up and boost coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed try block and added comments - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`afe243f`](https://github.com/oscal-compass/compliance-trestle/commit/afe243f6ece6fb9b361870e69b32d8d84a2e9335)) +Adds SSPInheritanceAPI class for interacting with leveraged auth +information -### Fix +Adds trestle global tags to markdown to store SSP location info -* fix: Remove empty folders (#904) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`552fb36`](https://github.com/oscal-compass/compliance-trestle/commit/552fb36a53198d9d1fcc06a0a3eb3cfe59b753b2)) +Co-authored-by: Alex Flom <alexander.flom@gmail.com> -* fix: tmp req init (#894) +* docs: add docs updates for SSPInheritanceAPI class -* fixed indent - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`e2d3ed0`](https://github.com/oscal-compass/compliance-trestle/commit/e2d3ed0f98a281ac5ef77edf5f4e90a0a09f53d8)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: bad control causes uncaught exception in ssp-generate (#893) +* chore: updates warning message for leveraged authorization with comps -* fixed issue with bad control id - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added test profile - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved multiline f string format - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`c50515a`](https://github.com/oscal-compass/compliance-trestle/commit/c50515a55452b776ed9397b62e658fb5d5b1d5b0)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: Ignore subfolders in folders validation (#889) +* fix: updates ssp-assemble to ensure existing leveraged comps persist -* fix: Fix template version for empty headers - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Ignore subfolders in folders - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Remove added line - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`727265a`](https://github.com/oscal-compass/compliance-trestle/commit/727265aebbcbdeffce5575c5907ba1fd000bdea3)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Refactor +* fix: adds fixes to address PR feedback -* refactor: osco-to-oscal performance improvements. (#886) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* Remove extraneous typing. - -* Remove osco_helper.py, consolidate into osco.py. - -* Oscal Result Factory. - -* Add checking flag. - -* Use monkeypatch. - -* Observation properties, without checking. - -* Remove more extraneous typing. - -* Correct return type of OscalResultsFactory.components. - -* Fix code smell. - -* Fix rule_use_generator return type. - -* Expunge pass statement (code smells). - -* 100% test coverage. - -* Fix presumed existence of "-". - -* Add cis-to-component-definition tutorial to mkdocs.yml ([`b3ae044`](https://github.com/oscal-compass/compliance-trestle/commit/b3ae044923935623ff162129e5ba5206e20ad23a)) +* refactor: polishes SSPInheritanceAPI class to reduce complexity -### Unknown +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* Merge pull request #907 from IBM/develop +--------- -chore: Trestle release - enabling plugin architecture ([`0865000`](https://github.com/oscal-compass/compliance-trestle/commit/08650008ffb5252c61d55eb2727825edb7d67889)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> +Signed-off-by: Alex Flom <alexander.flom@gmail.com> +Co-authored-by: Alex Flom <aflom@redhat.com> +Co-authored-by: Alex Flom <alexander.flom@gmail.com> ([`6cf498b`](https://github.com/oscal-compass/compliance-trestle/commit/6cf498b26aa2a2d583714470038291b0567fb80a)) +### Fix -## v0.30.0 (2021-11-22) +* fix: correct empty values going in assembled profile (#1491) -### Chore +* fix: correct empty values going in assembled profile -* chore: Trestle release +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -chore: Trestle release ([`94e161b`](https://github.com/oscal-compass/compliance-trestle/commit/94e161b3ccde191b97361a3e5d37222ad04ff27b)) +* fix: add test case to check profile values replaced -* chore: Merge back version tags and changelog into develop. ([`ab49b65`](https://github.com/oscal-compass/compliance-trestle/commit/ab49b65ddfe6e9b4d28abe0c796c62bacbaf717a)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Feature +--------- -* feat: OSCO transformer support for OpenScap 1.3.5 (#876) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`136b712`](https://github.com/oscal-compass/compliance-trestle/commit/136b712cfaf0392ae5673a6103700014d27b2866)) -* feat: OSCO transformer support for OPenScap 1.3.5 - -* Use host_name as scc_inventory_item_id. - -* Fix code smell. - -* Use dict for passing args; use else clause when necessary. - -* Oops, signature typing issue. - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`dcfb34a`](https://github.com/oscal-compass/compliance-trestle/commit/dcfb34ae67ce0bf057d224a6eb4065e25d616a42)) +* fix: correct vulnerability (#1486) +* fix: correct critical vulnerability -## v0.29.0 (2021-11-19) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Chore +* fix: correcting vulnerability -* chore: Allowing multiple PR templates. (#873) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: UTesting multiple PR templates. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: UTesting multiple PR templates. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d34dc72`](https://github.com/oscal-compass/compliance-trestle/commit/d34dc7291aa5901f0751b69adf7437a5b85f468a)) +--------- -* chore: Merge back version tags and changelog into develop. ([`aeae771`](https://github.com/oscal-compass/compliance-trestle/commit/aeae771e0e90c7c69ef914ca02d4857ed6f50222)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`4610d24`](https://github.com/oscal-compass/compliance-trestle/commit/4610d247516c7ddc37a1b1774b31fbfb9f5012fa)) -### Feature +* fix: move to new org (#1483) -* feat: tutorial for task cis-to-component-definition (#870) +* fix: move to new org -* feat: tutorial for task cis-to-component-definition - -* reduce size of sample output. - -* mdformat - -* Remedies for reviewer comments. - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`4e4d6b4`](https://github.com/oscal-compass/compliance-trestle/commit/4e4d6b4ba600792ce5a6dfd3606fb730099cbdef)) +github.com/IBM -> github.com/oscal-compass +ibm.github.io -> oscal-compass.github.io -* feat: Add support for ignored fields to header (#794) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat: Add support for ignored fields to header - -Specific list: -- 'extra-fields' -- 'additional-approvers' - -Signed-off-by: Ryan Moats <rmoats@us.ibm.com> - -* Update added tests - -Conform to new directory structure - -Signed-off-by: Ryan Moats <rmoats@us.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`37e9b60`](https://github.com/oscal-compass/compliance-trestle/commit/37e9b60cecf6516c934fafa8fa969672ade8ef7f)) +* fix: run make mdformat -### Fix +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: cat assemble label needs to load labels as properties when reading controls (#878) +* fix: correct missing org changes -* load label as property when reading controls - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed invocations involving header_dont_merge - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* force prompt of additional content - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added test and more docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`0b97476`](https://github.com/oscal-compass/compliance-trestle/commit/0b97476db8bfbac4925b2af2ec1b8edda9178e33)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: cleanup PR template. ([`f7c433b`](https://github.com/oscal-compass/compliance-trestle/commit/f7c433b8a4d86a39150e596e4e395b03a2dab984)) +--------- -* fix: Current support for multiple PR templates is insufficient in Github. (#879) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +Co-authored-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`c456779`](https://github.com/oscal-compass/compliance-trestle/commit/c4567792cc62b7e9e85c8dca0ce2d26fe82fcbc6)) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`bf12f2e`](https://github.com/oscal-compass/compliance-trestle/commit/bf12f2e464adaf371ec2f7f63050395a05ec1cfb)) +* fix: sonar (#1481) -* fix: Updating documentation to exploit code highlighting. (#877) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`4e7e8fd`](https://github.com/oscal-compass/compliance-trestle/commit/4e7e8fd6618852dcceb4b464a7cabc91154e171a)) -* fix: Updating documentation to exploit code highlighting. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Minor changes - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`10bd679`](https://github.com/oscal-compass/compliance-trestle/commit/10bd6792d8a9b9b42d26653fffd40baaad4d3251)) +* fix: correct critical vulnerability (#1479) -* fix: mangled merging of lists and lack of recursion in profile resolver (#869) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`72b0f6f`](https://github.com/oscal-compass/compliance-trestle/commit/72b0f6f132fe7f6ed20fd29e47e13656082c0d29)) -* generalized recursive profile resolver - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweaked docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added list item types - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* small cleanup - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* more simplification - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix: Ensure trackback logging occurs only on debug level. (#872) - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* final tweaks - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed unreachable code - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`e3ccbbc`](https://github.com/oscal-compass/compliance-trestle/commit/e3ccbbc4c6675264dcc245ed6c5e2454d04078c8)) +* fix: link main readme to agile authoring setup repo (#1477) -* fix: Incorrect behaviour of lint PR. (#868) +* fix: link main readme to agile authoring setup repo -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e5209c3`](https://github.com/oscal-compass/compliance-trestle/commit/e5209c33f8d53bd022e410d52ef97d3316746023)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Refactor +* fix: docs validate -* refactor: use monkeypatch to replace more mock library patch blocks (#874) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* refactor(tests): migrated tests from unittest.mock to monkeypatch for assemble.py and command.py -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* refactor(tests): lint and format. -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* refactor(tests): migrated from unittest.mock to monkeypatch for docs_test.py -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* refactor(tests): migrated from unittest.mock to monkeypatch for folders_test.py -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* refactor(tests): migrated from unittest.mock to monkeypatch for task_test.py -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* refactor(tests): migrated from unittest.mock to monkeypatch for replicate_test.py -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> ([`256f5d4`](https://github.com/oscal-compass/compliance-trestle/commit/256f5d4fcd5a2f9193ee374a098565c64a71d2bf)) +--------- + +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`88c1606`](https://github.com/oscal-compass/compliance-trestle/commit/88c16064897644db03aab11799a6dfc31ec8a1d2)) + +* fix(tests): pins oscal-content references in tests the latest 1.0 commit (#1474) + +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`0dc7551`](https://github.com/oscal-compass/compliance-trestle/commit/0dc755184fb8c061cacc90cc930ea7b0c43f2b7c)) ### Unknown -* Merge pull request #880 from IBM/develop +* Merge pull request #1492 from oscal-compass/develop -chore: Trestle release ([`c6b1bf8`](https://github.com/oscal-compass/compliance-trestle/commit/c6b1bf833b4d692b73546ee2d7c03a913c76cea6)) +chore: Trestle release ([`e6c42fa`](https://github.com/oscal-compass/compliance-trestle/commit/e6c42fad64855796fe21ca082cfc1c9fa879a2e9)) +* fix - trestle direct dependency on requests pkg (#1488) -## v0.28.1 (2021-11-17) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`c112f9c`](https://github.com/oscal-compass/compliance-trestle/commit/c112f9cf1ec9ff5228b58a4383beb5f9684b9591)) -### Chore +## v2.4.0 (2023-10-26) -* chore: Merge back version tags and changelog into develop. ([`2704553`](https://github.com/oscal-compass/compliance-trestle/commit/2704553dda7b8f8daa9dbb6003084080871adbc3)) +### Chore -### Fix +* chore: Trestle release -* fix: remove results {} from osco-to-oscal console display (#866) +chore: Trestle release ([`041a267`](https://github.com/oscal-compass/compliance-trestle/commit/041a267027e6023e477808934ba0727e411a5810)) -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`d62051e`](https://github.com/oscal-compass/compliance-trestle/commit/d62051e0fb45c99edd97b0314117b7208dd11d91)) +* chore: Merge back version tags and changelog into develop. ([`a633327`](https://github.com/oscal-compass/compliance-trestle/commit/a63332709d49e54a4cd541e6afdb02b232cbce7d)) -* fix: add spec.desctiption to produced yaml (#865) ([`b988684`](https://github.com/oscal-compass/compliance-trestle/commit/b988684ffb02011c4f890b8f889abb0c7184e03c)) +### Documentation -### Unknown +* docs: updating vtt documentation for trestle author docs (#1471) -* Merge pull request #867 from IBM/develop +* docs: updating vtt documentation for trestle author docs -fix: trestle release ([`b952390`](https://github.com/oscal-compass/compliance-trestle/commit/b952390f90a97eb60c60cd69b71f67431f5744c0)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +* fix: correct wording -## v0.28.0 (2021-11-16) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Chore +--------- -* chore: Merge back version tags and changelog into develop. ([`60920c6`](https://github.com/oscal-compass/compliance-trestle/commit/60920c6da1bb2d10f56575ff9a4012887a176ab3)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`63d436a`](https://github.com/oscal-compass/compliance-trestle/commit/63d436a7752e50ef0c52c93cbab36f4c1fc16748)) -### Fix +### Feature -* fix: Fix instance version (#862) +* feat: adding validate template type to author docs command (#1465) -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`56f7cdf`](https://github.com/oscal-compass/compliance-trestle/commit/56f7cdfe537adfcfcb8398df7d06b71cbf35781d)) +* feat: adding validate template type to author docs command -### Unknown +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* Merge pull request #863 from IBM/develop +* fix: rename test cases files to be more generic -fix: Trestle bug fix release. ([`9bcb217`](https://github.com/oscal-compass/compliance-trestle/commit/9bcb21787a71e67db1bf94f812aa0e3ba8260cfe)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +--------- -## v0.27.2 (2021-11-16) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`5289f51`](https://github.com/oscal-compass/compliance-trestle/commit/5289f516e9710361e0dc391cefd979b5e2d46ed0)) -### Chore +### Fix -* chore: Merge back version tags and changelog into develop. ([`c5480f5`](https://github.com/oscal-compass/compliance-trestle/commit/c5480f5d51c65c9066dabb347102dbc0a9b9a05d)) +* fix: upgrade urllib version to fix vulnerability (#1472) -* chore: Merge back version tags and changelog into develop. ([`3ab740b`](https://github.com/oscal-compass/compliance-trestle/commit/3ab740ba766941e9ea93368b20458a7f26f21f24)) +* fix: upgrade urllib version to fix vulnerability -* chore: Merge back version tags and changelog into develop. ([`d546739`](https://github.com/oscal-compass/compliance-trestle/commit/d5467397cbfe0ccc66e6f5bfd783747e7751603e)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Feature +* fix: correct typo -* feat: Add yaml header to various trestle author docs in a safe manner. (#853) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Preserve yaml header ordering in markdown ssp workflows. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: Add safe yaml behaviour - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`0b6f8a1`](https://github.com/oscal-compass/compliance-trestle/commit/0b6f8a18d1de460c14fa36d107729e367682045e)) +--------- -### Fix +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`e9d4175`](https://github.com/oscal-compass/compliance-trestle/commit/e9d4175fabd015ada6e8cdd26450c454ad83fbe8)) -* fix: force trestle relesae. ([`49243e3`](https://github.com/oscal-compass/compliance-trestle/commit/49243e369120958536a644a4a063cf19f1870b7a)) +* fix: improve bad property error message by including csv row number (#1466) -* fix: Correcting mkdocs (#860) +* fix: improve bad property error message by including csv row number -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`89a6d0d`](https://github.com/oscal-compass/compliance-trestle/commit/89a6d0dc42d87b7082ec4c1a2def684cc4ae543b)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Relabel yaml-safe to header-dont-merge. (#858) +* fix: handle empty ProfileSource correctly -* fix: Relabel yaml-safe to header-merge. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: recommended changes to be backwards compatible. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`58e6b1d`](https://github.com/oscal-compass/compliance-trestle/commit/58e6b1d8bec4a5b210d47d24acaf2ea770a31000)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: 2 bugs in task cis-to-component-definition (#856) +* fix sonar code smells -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`61da0b8`](https://github.com/oscal-compass/compliance-trestle/commit/61da0b89aaab4c15b0e4a2c885efbdf387b30d10)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Fix headers recurse flag (#849) +* fix sonar code smell -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`d285cc6`](https://github.com/oscal-compass/compliance-trestle/commit/d285cc61ff52531d821c03ab4bcfdf4966b9c44e)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Unknown +--------- -* Trestle Release (#861) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`ab97beb`](https://github.com/oscal-compass/compliance-trestle/commit/ab97beb2367112e9e68fb258af6dc2c75d909279)) -* fix: Fix headers recurse flag (#849) - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Add yaml header to various trestle author docs in a safe manner. (#853) - -* fix: Preserve yaml header ordering in markdown ssp workflows. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: Add safe yaml behaviour - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: 2 bugs in task cis-to-component-definition (#856) - -Co-authored-by: Chris Butler <chris@thebutlers.me> - -* fix: Relabel yaml-safe to header-dont-merge. (#858) - -* fix: Relabel yaml-safe to header-merge. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: recommended changes to be backwards compatible. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correcting mkdocs (#860) - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: compliance-trestle-1 <84952801+compliance-trestle-1@users.noreply.github.com> -Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> -Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`c0d2901`](https://github.com/oscal-compass/compliance-trestle/commit/c0d29012b74d239d45e7e25ca841ebee3a2a09ec)) +* fix: cryptic error message + feat: # indicates comment column (#1459) -* Trestle release (#859) +* Fix: improve error message when invalid property value specified -* fix: Fix headers recurse flag (#849) - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Add yaml header to various trestle author docs in a safe manner. (#853) - -* fix: Preserve yaml header ordering in markdown ssp workflows. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: Add safe yaml behaviour - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: 2 bugs in task cis-to-component-definition (#856) - -Co-authored-by: Chris Butler <chris@thebutlers.me> - -* fix: Relabel yaml-safe to header-dont-merge. (#858) - -* fix: Relabel yaml-safe to header-merge. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: recommended changes to be backwards compatible. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: compliance-trestle-1 <84952801+compliance-trestle-1@users.noreply.github.com> -Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> -Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`127e7ba`](https://github.com/oscal-compass/compliance-trestle/commit/127e7baf4688c505a6e51259af093823594c86b9)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +* feat: support #column heading name ignored -## v0.27.1 (2021-11-15) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Chore +--------- -* chore: Merge back version tags and changelog into develop. ([`8168c8c`](https://github.com/oscal-compass/compliance-trestle/commit/8168c8cf39c0cff989d34c5e983e3fbd7be9e469)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`45eda01`](https://github.com/oscal-compass/compliance-trestle/commit/45eda015751d2f9121e14fe609b14acd890440fd)) -### Fix +* fix: update community call information (#1444) -* fix: profile resolver issues with alter that has no adds (#847) +* fix: update community call information -* fixed issue with alter no adds - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`6865eb7`](https://github.com/oscal-compass/compliance-trestle/commit/6865eb7967ae954b14f5a10921d88ca567fae921)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Unknown +* fix: extending timeout time test -* Bug fix release +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Bug fix release ([`89fde8c`](https://github.com/oscal-compass/compliance-trestle/commit/89fde8ceee2b4eef9aec97a56f8b5e45f90711a7)) +* fix: correct link +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -## v0.27.0 (2021-11-14) +* fix: update community call info -### Chore +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Correct CI triggering issues. ([`6d529dc`](https://github.com/oscal-compass/compliance-trestle/commit/6d529dc2d85845dedc78b5af809bc18f2f23cb51)) +* fix: remove unnecesary details on meeting host -* chore: Adding docstrings automatically to all oscal models. (#827) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`0ff4dce`](https://github.com/oscal-compass/compliance-trestle/commit/0ff4dce660c0753c562b8d52eddcaa8ffd6bed98)) +--------- -* chore: Remove baseexceptions (#826) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`5a03d06`](https://github.com/oscal-compass/compliance-trestle/commit/5a03d06783fff8db4bf402b1e21acb99fd485454)) -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`69492ff`](https://github.com/oscal-compass/compliance-trestle/commit/69492ff292f1aa39fe6730552fa69821dbf70b41)) +## v2.3.1 (2023-09-20) -* chore: reduce lists in given input file and save into given output file (#807) +### Chore -* feat: recursively reduce lists in given input json file and save into given output file in json -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* feat: just one non-zero return code value of 1 for any exception -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* feat: last minute change in error, neglected to lint. -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* feat: lint again -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> ([`998cdee`](https://github.com/oscal-compass/compliance-trestle/commit/998cdee4bd3c816ee7a1d816948bc615f209d026)) +* chore: Merge back version tags and changelog into develop. ([`420f341`](https://github.com/oscal-compass/compliance-trestle/commit/420f3410fccfcf1b3ddd606962290c9abed5ec2e)) -* chore: Merge back version tags and changelog into develop. ([`8dc9934`](https://github.com/oscal-compass/compliance-trestle/commit/8dc99341f8512c8de1039b329067e6ee8448af17)) +### Fix -### Feature +* fix: improper indentation structure validation not working (#1451) -* feat: Add ability to use different versions of templates (#837) +* fix: improper indentation structure test -* feat: Add Template_Version to templates and instances - -Partially Closes: https://github.com/IBM/compliance-trestle/issues/761 - -Signed-off-by: Ryan Moats <rmoats@us.ibm.com> - -* Restructure to remove duplicate code - -Signed-off-by: Ryan Moats <rmoats@us.ibm.com> - -* Address Lint failures - -Signed-off-by: Ryan Moats <rmoats@us.ibm.com> - -* feat: Add template versioning - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Fix python version - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Refactor code - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Update docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Switch logic to allow custom versions - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Allow validation of all versions - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Attempt to fix Windows issue - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Attempt to fix Windows issue - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Attempt to fix Windows hidden file - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: improved handling of hidden files in tests for windows (#846) - -* feat: facilitate improved performance within Tanium transformer. (#835) - -* Facilitate parallel processing to boost transform performance. - -* Add comments. - -* Multi-CPU testing fix. - -* monkey uuid.getnode() - -* lint. - -* Fix test uuid generation. - -* Another testing fix for UUID generation. - -* Monkey business. - -* Bypass multiprocessing for single batch. - -* add: temporary hack to test execute cpus, for windows. - -* Fix code smells. - -* Hack cpus test for now, since windows fails intermittently. - -* Unhack cpus test. - -* Lint. - -* Tidy up. - -* Update for 100% code coverage. - -* "huge" test case, config, and backup of "hack" solution. - -* fix: Tune property construction to reduce overhead - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Remove extraneous. - -* Fix transform time and batch size calculations. - -* Support checking and/or multiprocessing. - -* Typing fixes. - -* Delete re-named file. - -* Updates to address comments: - -- for loop -- type int -- large cpu values in test -- signature of __init__ - -* Fix comment re: OscalFactory. - -* Code smells fixes. - -* More code smells fixes. - -* Continue code smells fixing. - -* Test coverage 100% - -* fix: Minor signature changes - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Chris Butler <chris@thebutlers.me> - -* fixed handling of hidden files on windows - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: degenaro <lou.degenaro@gmail.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Ryan Moats <rmoats@us.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`c6d3618`](https://github.com/oscal-compass/compliance-trestle/commit/c6d3618f13e6dc945413867a8d102cd3a7c3c211)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat: facilitate improved performance within Tanium transformer. (#835) +* fix: addition to full profile -* Facilitate parallel processing to boost transform performance. - -* Add comments. - -* Multi-CPU testing fix. - -* monkey uuid.getnode() - -* lint. - -* Fix test uuid generation. - -* Another testing fix for UUID generation. - -* Monkey business. - -* Bypass multiprocessing for single batch. - -* add: temporary hack to test execute cpus, for windows. - -* Fix code smells. - -* Hack cpus test for now, since windows fails intermittently. - -* Unhack cpus test. - -* Lint. - -* Tidy up. - -* Update for 100% code coverage. - -* "huge" test case, config, and backup of "hack" solution. - -* fix: Tune property construction to reduce overhead - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Remove extraneous. - -* Fix transform time and batch size calculations. - -* Support checking and/or multiprocessing. - -* Typing fixes. - -* Delete re-named file. - -* Updates to address comments: - -- for loop -- type int -- large cpu values in test -- signature of __init__ - -* Fix comment re: OscalFactory. - -* Code smells fixes. - -* More code smells fixes. - -* Continue code smells fixing. - -* Test coverage 100% - -* fix: Minor signature changes - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`4d2ded4`](https://github.com/oscal-compass/compliance-trestle/commit/4d2ded49d314f6e632f531b08a58bc66d53d8997)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat: Significant json (de)serialisation performance improvements. (#841) +* fix: correct profile generation issue -* feat: Significant json performance improvements - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: Improved json IO performance - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Adding benchmarking scripts - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Add orjson for loading as well - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Remove now unused internal function - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Optimising opportunistic copy - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correct issues with conventional PR - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d6f3cb1`](https://github.com/oscal-compass/compliance-trestle/commit/d6f3cb1ab8113c997d463d832aa8c8b721faffd2)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat: add yaml header output for profile and catalog generate (#833) +* fix: correcting format -* added yaml header support - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* convert strings to const and boost coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`50093f0`](https://github.com/oscal-compass/compliance-trestle/commit/50093f075615fe25bb6e25b16ff5d98fb0a308f9)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat: Add ability to write modified drawio files (#813) +* fix: adding new line each prose subpart gets added to final subpart -* feat: Write modified drawio - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Use constants - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Keep old attributes and encoding - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Add docs - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`ea814bf`](https://github.com/oscal-compass/compliance-trestle/commit/ea814bfdcfb8e75e2812e182ec09b009e693312a)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat: build-component-definition (#788) +* fix: correcting top comment on profile values comment -* feat: build-component-definition - -* format + lint fix-up. - -* sonar fixes. - -* rename task as cis-to-component-definition, misc changes + 100% test cov - -* sunc - -* remove assert - -* fix code smell. - -* use https. - -* Remove t_<type> statements. - -* use monkeypatch. - -* Remove locally defined get_trestle_version(). - -* Remove properties. - -* Simplify ingestion of filtering rules json. - -* Use Path.open() - -* Revise fetch parameters map. - -* function parameter types. - -* coverage 100% - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`9f7b1fe`](https://github.com/oscal-compass/compliance-trestle/commit/9f7b1fec0efc017698ceef4c6bf77c132626ec93)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat: ssp filter allows filter of ssp based on profile (#805) +--------- -* initial version of ssp filter - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* refactor and boost coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* cleaned up smells - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed model enum and converted strings to const - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* reworked the fs top_level_model access and cleaned up further - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final cleanup of const - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* optional on filecontent - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`494ba1b`](https://github.com/oscal-compass/compliance-trestle/commit/494ba1b9a749c44657365f45fc88a8c4aa94ed73)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`2e6936a`](https://github.com/oscal-compass/compliance-trestle/commit/2e6936a4705251fd8412fd67163a7cd9d801a4b8)) -* feat: Add centralised markdown API (#797) +* fix: fixing typo in encoding name (#1448) -* feat: Add markdown api - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Fix test - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Small changes - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Handle html tags - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* Add documentation - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`8582516`](https://github.com/oscal-compass/compliance-trestle/commit/8582516f59a8258b513312185b8efdd4cb7a001e)) +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`bdf60b2`](https://github.com/oscal-compass/compliance-trestle/commit/bdf60b26075f7250bcdbbe08745630b27042ad74)) -### Fix +* fix: parameter aggregation fix (#1443) -* fix: Preliminary fix for parameters where 'set parameter' is called an a value does not exist. (#823) +* fix: parameter aggregation fix -* chore: Adding tests to verify behaviour parameter resolution - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Allow for cases where a"set parameter" is used without setting values - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Adding more complexity to tests to ensure coverage of the tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Initial implementation of imporoved props adding. Testing TBC. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Staging for Frank - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: remove dependency on bad logging behaviour. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: profile merge support (#828) - -* added support for merge methods in profile resolver - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added doc string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix: Small typo fixes - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correct small errors - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Segregate functions to reduce cognitive complexity. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Reduce cognitive complexity. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* extended support for profile_resolver - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix: Completing UT's and reducing code redudancy - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Added missing test files. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* better coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* increased coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed pr feedback - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix: Small formatting changes. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* profile param order sub works - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* trying to make constraints work - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* minor change to convert a warning to a debug msg - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* now using attrs for part components - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* changed default behavior in tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Co-authored-by: Frank Suits <frankst@au1.ibm.com> ([`d20f2b9`](https://github.com/oscal-compass/compliance-trestle/commit/d20f2b9e6ca10c4fa829bb723d68ea3d06902cd0)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: merge yaml header content when writing control (#825) +* fix: arranging tests -* now write catalog as markdown will check for yaml header contents - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added comments - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added coverage and docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed small bug in merge dicts - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* one more coverage line - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* another coverage line - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* small bug - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* error in tutorial text - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* final fix - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* clarified doc strings - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* test utils return bool instead of int - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`8d0b3b0`](https://github.com/oscal-compass/compliance-trestle/commit/8d0b3b0f3a6c5e3a47a42b46b77081a700947d6b)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: all Alter/Add of prop by_id (#821) +* fix: triggering build -* allow add by_id - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added by_id prop to test file - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed unneeded catalog interface - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a9047a8`](https://github.com/oscal-compass/compliance-trestle/commit/a9047a83e0b0c64c34448f776a7e13fff77e6b2a)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: ssp generate with alter props issue (#819) +* fix: increase time out for cache response -* fix for ssp generate - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* increase coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a1e4219`](https://github.com/oscal-compass/compliance-trestle/commit/a1e421944ce11432b2b2832b8f669b65428f1b38)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Allow markdown substitutions (#812) +* fix: profile-values are shown in markdown even when there are values already -* fix: Allow markdown substitutions - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Refactor code - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Fix typos - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`8d52d3e`](https://github.com/oscal-compass/compliance-trestle/commit/8d52d3eb4aaa0a73685983114ffa38c494b9fec4)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Handle hard line breaks (#804) +* fix: adding alt identifier validation -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`b1e39c1`](https://github.com/oscal-compass/compliance-trestle/commit/b1e39c1173b235a87981a2856081cd54aeac86e3)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Unknown +* fix: correct profile values validation -* Merge pull request #845 from IBM/develop +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Trestle release ([`7e8292d`](https://github.com/oscal-compass/compliance-trestle/commit/7e8292db889b8f1e3babf1e6327641b7e179b967)) +* fix: remove parameter aggregation from assembly and remove label being shown in assembled profile +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -## v0.26.0 (2021-10-20) +* fix: correcting test failures and various formatting issues -### Chore +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Accomodate forked repos by separating sonarqube quality gate (#791) +* fix: change order for parameters in markdown -* chore: Accomodate forked repos by separting sonarqube quality gate - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Add triggers for remote branches - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore(cicd): Correcting CI yaml format. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Alter CI pipeline to use PR target, potentially avoiding issues for sonarqube - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ae95c25`](https://github.com/oscal-compass/compliance-trestle/commit/ae95c25dd1e3fec3c86ea34cd9981ddca65bf6d4)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Ensure sonar quality gate is measured (#775) +* fix: not setting empty values -* chore: Ensure sonar quality gate is measured - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Cleaning up badges - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Cleaning up PR template - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Clean up links - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correct image links - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ca25f93`](https://github.com/oscal-compass/compliance-trestle/commit/ca25f935749ef3dae804e98c82cee5cc4a587136)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Updated python directory. +--------- -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`cbc451e`](https://github.com/oscal-compass/compliance-trestle/commit/cbc451e2c81eab0b9e509ff050b53e95d18bb85c)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`dd9e3bc`](https://github.com/oscal-compass/compliance-trestle/commit/dd9e3bc2ebaeab23f3c4fc0647ec3942d38bed16)) -* chore: Correct trestle sonar config. +* fix: prevent duplicates in set-parameters (#1450) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`6bd8002`](https://github.com/oscal-compass/compliance-trestle/commit/6bd80026d10b9587ea086e8f41c76783959cac37)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`62e2f05`](https://github.com/oscal-compass/compliance-trestle/commit/62e2f059dd2ae08616895ebdfd6e37258483019d)) -* chore: Correct trestle sonar config. +### Unknown -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`2c75f03`](https://github.com/oscal-compass/compliance-trestle/commit/2c75f03914d89e60b017e17eb0779eda85253a89)) +* Merge pull request #1452 from IBM/develop -* chore: Correct trestle sonar config. +chore: Trestle release ([`dd94dd8`](https://github.com/oscal-compass/compliance-trestle/commit/dd94dd8723bd23508504f789458510de6ae7c3d0)) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9884eb6`](https://github.com/oscal-compass/compliance-trestle/commit/9884eb6c4c458432422d23e750e36e3220160a0a)) +## v2.3.0 (2023-09-06) -* chore: replace codecov with sonarcloud (#765) +### Chore -* chore: replace codecov - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Force clean coveralls install. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Force clean coveralls install. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correcting tokens - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Testing sonarcloud - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Update for SONAR to use coverage.xml - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Removing pcoveralls - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Adding sonar properties file. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Update sonar workflow. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Adding develop 'push' to ensure develop build is okay - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`1c41a04`](https://github.com/oscal-compass/compliance-trestle/commit/1c41a04bb7943f016e1148af6516da0d27fe9b9b)) +* chore: Merge back version tags and changelog into develop. ([`3ea6add`](https://github.com/oscal-compass/compliance-trestle/commit/3ea6add2319bad28630afdcb9602c6b8e53fb125)) -* chore: Adding extra developer documentation (#763) +* chore: adds typing fixes in profile.py for ProfileInherit (#1433) -* chore:Adding extra developer documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Adding extra developer documentation. - -* chore: Correcting typos - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`3242fc8`](https://github.com/oscal-compass/compliance-trestle/commit/3242fc85b9b66083b8d44fece2ce0c7349b741ce)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`0593651`](https://github.com/oscal-compass/compliance-trestle/commit/0593651a6da82b3a73163e79ce376134e93a84a4)) -* chore: Merge back version tags and changelog into develop. ([`84c1b4d`](https://github.com/oscal-compass/compliance-trestle/commit/84c1b4d81fbecb639aa846773c1fa1fd4352bdf8)) +* chore: Merge back version tags and changelog into develop. ([`4f90258`](https://github.com/oscal-compass/compliance-trestle/commit/4f90258fc4490463de926fc77934d82b3ee6e7ac)) ### Feature -* feat: Add exclusion flags to trestle author header validate to allow practical use without a task name. (#793) +* feat: extend multiple templates validation to trestle author folders (#1430) -* fix: Adding more UTs - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: Adding exclude flag to trestle author headers. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Update test function names. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correct sonar gate which was not triggering - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correct sonar gate which was not triggering - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Resolve python 3.7 compatibility issues - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Cater to files w/o extensions - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d77408f`](https://github.com/oscal-compass/compliance-trestle/commit/d77408f39e914bff3dfc20ecf91e3a982a49bf4e)) +* feat: extend multiple templates validation to trestle author folders command -* feat: allow author edits and update of profile (#771) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* added control objective handling - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* objective seems ok - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* author profile works for prose - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added profile test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added test coverage for control_io - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* profile author now working - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* removed dead code - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* addressed pr changes and boosted coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* check moustaches - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* refined moustache work and improved excep handling - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docs for author profile and ssp tutorial - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* extra files - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tutorial edits and conversion to monkeypatch - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`650b6c9`](https://github.com/oscal-compass/compliance-trestle/commit/650b6c95eadfc68c5f0646761f57ac4b2542bb6c)) +* docs: adding documentation to ne feature -* feat: Improve profile resolver to cover "adds" scenarios in fedramp & NIST 800-53 (#766) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat: Support additional adding positions in adds - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Change doc line - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Move validation to profile resolver - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* feat: Backout profile to original state - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`75911f3`](https://github.com/oscal-compass/compliance-trestle/commit/75911f3f88c6b4d9a4adaea03a77db7f9a83faf9)) +* fix: addressing validation through name of template instead of type field -* feat: author catalog to support reading and writing controls and catalogs (#734) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* new catalog module - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* recurse the catalog - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved format - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* more consistent format - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* refactored catalog interface and control writing - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* hooking in new methods - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* hooking in read controls - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* renamed some items - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* cleaned up control output - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added tests for control_io and now read/write controls - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* changes for statement and item - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* now test assembled catalog is equivalent - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boost coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* additional cleanup based on PR review - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed typo and clarified some code - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* multiple changes based on revision requests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* adjust md format and test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* remove test md files - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* small tweaks to md format - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`0a2bcea`](https://github.com/oscal-compass/compliance-trestle/commit/0a2bcea49841c774a667aeb9368e776402db23cf)) +* fix: update guidance to correct wording -### Fix +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: ssp issues (#795) +* fix: add x trestle ignore field in header to correct mismatch -* fixed small issues with ssp generate and assemble - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated comments - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* dont prompt for content if already there - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* prevent leading and trailing new lines in prose - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boosted coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`3532e4e`](https://github.com/oscal-compass/compliance-trestle/commit/3532e4ef7c7db33e6875a27123a4b6a4fa2655cc)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Further refinements to CI pipeline (#796) +* fix: correcting mdformat -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`b46c63b`](https://github.com/oscal-compass/compliance-trestle/commit/b46c63be8a192993126b49c289e99ea5c10dc3a1)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Correct broken guards of sonarqube actions. ([`9e10c1e`](https://github.com/oscal-compass/compliance-trestle/commit/9e10c1e3fedc96c5f6e0b02651b77ce20d1421c5)) +* fix: correct code linting problem -* fix: Add missing __init__.py, which can cause issues with pytest. (#792) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`bc6fbf3`](https://github.com/oscal-compass/compliance-trestle/commit/bc6fbf34843f3101edd4236f5dab904fa6a3606f)) +* fix: return template type field to template header -* fix: Document submodule requirement for testing. (#782) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Ensure git submodules are checked out when setting up a developers environment. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Updated develop docs w.r.t. submodules. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Updated develop docs w.r.t. submodules. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`3e711a3`](https://github.com/oscal-compass/compliance-trestle/commit/3e711a3416e8155a0e082b65e89060ac3e9d3227)) +* docs: correcting documentation for x-trestle-template-type field -* fix: Resolve bugs in xlsx to component definition (#772) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: 2 bugs - -- print_info attempts to get non-existent data -- missing comma for correct alphabet specification - -* Employ more pythonic way of iterating through lower case alphabet. - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`ebff124`](https://github.com/oscal-compass/compliance-trestle/commit/ebff1247b5bc9abf615f10ae943b0fdff3644507)) +--------- -* fix: Remove two bugs generated from unraised exceptions. (#777) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`c7bef58`](https://github.com/oscal-compass/compliance-trestle/commit/c7bef589a6e671b96170e93feb88c6436a094da6)) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`5f698a6`](https://github.com/oscal-compass/compliance-trestle/commit/5f698a6c28c84a9eb9595ddd1248ce29f149895a)) +* feat: adds agile authoring functionality to public API in repository.py (#1432) -* fix: Remove use of http aligning with zero trust principles. (#770) +Fixes #1426 -* fix: Remove use of http aligning with zero trust principles. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:correct typo - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Exclude OSCAL automatically generated code from duplication metrics. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`5b0240c`](https://github.com/oscal-compass/compliance-trestle/commit/5b0240cfa83f89d5182e04efa91feb4eb06ad8fd)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`08b2559`](https://github.com/oscal-compass/compliance-trestle/commit/08b255902efb911c99422d49920c5ddaea98ef32)) -* fix(security): Remove user name from logs (#767) +* feat: support validation component_type for task csv-to-oscal-cd (#1431) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`4d075b8`](https://github.com/oscal-compass/compliance-trestle/commit/4d075b89776552a1f58751674e2056ac7afac3cc)) +* feat: Support "validation" component_type for task csv-to-oscal-cd -* fix(cli): Correctly capture return codes (#760) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix(conftest): Correctly capture return codes (#745). - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* fix(cli): Correctly capture return codes. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> ([`170d911`](https://github.com/oscal-compass/compliance-trestle/commit/170d9117dc318e39fa43249e424dcf244614ff1a)) +* fix sonar code smell -* fix: Added more checks for pylint. (#758) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`2443ced`](https://github.com/oscal-compass/compliance-trestle/commit/2443cedf0ad7f7357aa4a1606fe7ddc8f6f3830b)) +* add notes to -i output regarding required/ignored columns -* fix: Adding automated tests of binary distribution validate release. (#756) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Adding automated tests of binary distribution to ensure final release passes all tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Add python tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Correct yaml indentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: adding extra checks for pre-commit - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Add check for yaml files syntax - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correct issues with docstrings. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Corrected mdformat issues - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Changing PR check names to be cleaner - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`c0b6748`](https://github.com/oscal-compass/compliance-trestle/commit/c0b67485cd6e5619bbe4654d651931ce378315ca)) +* user properties for both validation and non-validation components -* fix: Ignore hidden files throughout the project (#755) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* fix: Ignore hidden files throughout the project - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Add additional test - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Adopt tests for Windows - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* fix: Remove test cleaning - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`aec1df4`](https://github.com/oscal-compass/compliance-trestle/commit/aec1df4e80168998a368d951861e62b502ca7fae)) +--------- -### Refactor +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`80aaa72`](https://github.com/oscal-compass/compliance-trestle/commit/80aaa72fe96217d1c7dd93e4c1d5bd9c34cb012b)) -* refactor: Refactor replicate command to use CLI choices (#753) +### Fix -* refactor: Refactor replicate command to use CLI choices - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -* refactor: Comply with code formatting - -Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`1c0a5fe`](https://github.com/oscal-compass/compliance-trestle/commit/1c0a5fef09f28e2fd663dcb3cb33e50396f0a27d)) +* fix: correcting typo -### Unknown +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`1810007`](https://github.com/oscal-compass/compliance-trestle/commit/181000731ada7af1348219581994bd58f2285329)) -* Merge pull request #800 from IBM/develop +* fix: correcting python semantice release version -Trestle release ([`bc908f4`](https://github.com/oscal-compass/compliance-trestle/commit/bc908f41c688cfb530724439c68865a58397e00b)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`a8cb9b9`](https://github.com/oscal-compass/compliance-trestle/commit/a8cb9b9f1f11485ac70fa2f35a3e52b917b7a783)) -* Create codeql-analysis.yml ([`2e73916`](https://github.com/oscal-compass/compliance-trestle/commit/2e73916730a0bac9f6a49b77d520785be28680b6)) +* fix: moving watch config a level up (#1447) +* fix: moving watch config a level up -## v0.25.1 (2021-09-30) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Chore +* fix: disable check for changes build to make the change in mkdocs config -* chore: Trestle release ([`e420bc5`](https://github.com/oscal-compass/compliance-trestle/commit/e420bc5fab4c0dcbf28ffdd1b57cf4e69069a3c0)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Merge back version tags and changelog into develop. ([`5f7c07d`](https://github.com/oscal-compass/compliance-trestle/commit/5f7c07d7379fc6c63e332397889aa2c376bcdad2)) +* fix: revert changes -### Fix +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Emergency fix for trestle packaging. (#751) +* fix: change mkdocs version -* fix: Emergency fix for trestle packaging. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: move install_requeest back into the correct setup.cfg section. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`8fedeaa`](https://github.com/oscal-compass/compliance-trestle/commit/8fedeaa641e7817fb4092224a315e1a38166078e)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +* fix: fix typo -## v0.25.0 (2021-09-29) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Chore +* fix: downgrade version to 1.5.0 -* chore: trestle release +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -chore: trestle release ([`f76a2d1`](https://github.com/oscal-compass/compliance-trestle/commit/f76a2d1944e02a74cc782fa1c6812df66ce45422)) +* fix: change mkdocstrings version to stable -* chore: Merge back version tags and changelog into develop. ([`e6dd0d7`](https://github.com/oscal-compass/compliance-trestle/commit/e6dd0d7b94ba7581800bb10304d973ffe5e7d0bf)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Feature +* fix: change mkdocs to pull latest version -* feat: osco results remove scc_goal_description (#736) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -- remove scc_goal_description class (but keep benchmark_id property) -- use result id rather than benchmark.id for scc_predefined_profile -class -- fix corresponding expected test outputs -- reduce size of rhel7 expected test output - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`f687a3d`](https://github.com/oscal-compass/compliance-trestle/commit/f687a3dcc44590a60f777d38eafe4013d54909e6)) +--------- -### Fix +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`ea5607f`](https://github.com/oscal-compass/compliance-trestle/commit/ea5607f9f404f38da1abf1c40f907196ea79c567)) -* fix: Ensure a minimimal code base is delivered via pypi (#741) +* fix: xccdf parameter type (#1440) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`03557bd`](https://github.com/oscal-compass/compliance-trestle/commit/03557bdd44980899342665bac2d1905489981a75)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`431670c`](https://github.com/oscal-compass/compliance-trestle/commit/431670cd468693ca4581ec43d8de5d32413ec113)) -* fix: Adding extra documentation for element path. (#735) +* fix: headings levels validation is not working properly (#1436) -* fix: Add extra documenntation for element path - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Correcting typos. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`bc32371`](https://github.com/oscal-compass/compliance-trestle/commit/bc32371e3f81adab5cd4621055421f2acb05c566)) +* fix: heading levels validation fixing -* fix: Test files to confirm and close issues (#732) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Adding extra test files. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Updated code docs. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correct packages - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e87eb84`](https://github.com/oscal-compass/compliance-trestle/commit/e87eb84aabffd842275a673e63e42c75bd418203)) +* fix: correcting test cases and adding extra validation -### Refactor +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* refactor: use monkeypatch to replace mock library patch blocks (#739) +--------- -* chore(tests): replace mock patching with monkeypatch(ing) instead. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(tests): linted and formatted. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(tests): One monkeypatch switch for cache_test.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(cache_test): with patch (unittest) blocks replaced with monkeypatch in cache_test.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(conftest): monkeypatch switched for unittest patch block in conftest.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(split_test): monkeypatch instead of unittest patch block in split_test.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(validate_test): monkeypatch instead of unittest 'with patch' blocks in validate_test.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(init_test): monkeypatch instead of unittest 'with patch' blocks in init_test.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(href_test): monkeypatch instead of unittest 'with patch' blocks in href_test.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(version_test): monkeypatch instead of unittest 'with patch' block in version_test.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(import__test): monkeypatch instead of unittest 'with patch' blocks in import__test.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(main_test): monkeypatch instead of unittest 'with patch' block in main_test.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(cli_test): monkeypatch instead of unittest 'with patch' block in cli_test.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* chore(test_utils): monkeypatch instead of unittest 'with patch' block in test_utils.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* Revert "chore(test_utils): monkeypatch instead of unittest 'with patch' block in test_utils.py." - -This reverts commit a99ad81a143f43b0c656d8975fa9c670d75b9b46. - -Explanation: - The changes being reverted really just makes the code look nicer for one 'with patch' block. -If this is indeed replaced with monkeypatch, with the latter as an art for the create_trestle_project_with_model() -function, then all calls to create_trestle_project_with_model() will need refactoring to include a MonkeyPatch -argument. This does not seem worth it, so reverting. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* refactor(tests): monkeypatch instead of unittest 'with patch' block in test_utils.py and, being affected, split_test.py. - -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`88a4f3c`](https://github.com/oscal-compass/compliance-trestle/commit/88a4f3ccc08778deb3596c06203bd139048af25f)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`22b65a9`](https://github.com/oscal-compass/compliance-trestle/commit/22b65a9b84af36d8c12c32c6e5c0dae88208ea49)) +* fix: default set-parameter values as list (#1438) -## v0.24.0 (2021-09-21) +* fix: default set-parameter values as list -### Chore +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* chore: add link to compliance-trestle demos in main README.md. (#722) ([`cbf9524`](https://github.com/oscal-compass/compliance-trestle/commit/cbf95247dcba5731221db22393a67beff3c92770)) +* fix string to list comment and blanks removal -* chore: Merge back version tags and changelog into develop. ([`e8a7b82`](https://github.com/oscal-compass/compliance-trestle/commit/e8a7b82befcfe4a95e6e8d42a4829c03d050e3ee)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Feature +--------- -* feat: Allow import to use the caching functionality to access external URLs (https/sftp etc) (#718) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`419025d`](https://github.com/oscal-compass/compliance-trestle/commit/419025dfad47cf9f61b5e20a35a9683a84ed26e8)) -* import now via cache - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* some cleanup - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* import now uses cache and can work with relative paths. - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* remove sftp:// from fetcher uri test causing failure cicd - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* localizing test failure in cicd - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added try clause for urlparse - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix: Refactored test to use parametrize - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* removed ftp case - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* blocked off bad uri tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added tests back in - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* disallow : in local files for unix - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweaked slashes for unix - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tutorial import via url and add windows encoding - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed encoding issue on write in cache - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixes made based on PR feedback - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`3527259`](https://github.com/oscal-compass/compliance-trestle/commit/352725952687fde4627c97037e68f2238c638a04)) +* fix: expected nist profile missing (#1435) -### Fix +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`c96f9ce`](https://github.com/oscal-compass/compliance-trestle/commit/c96f9ce82e453c83a07d9d4c1061833f38c7f104)) -* fix: Update OCP compliance operator transform to use classes expected by IBM SCC. ([`2068f57`](https://github.com/oscal-compass/compliance-trestle/commit/2068f570ff6d47bb0348e630cd4dc01e2d90e4b5)) +* fix: provide description and meaning to parameters in markdown (#1423) -* fix: Correct split merge pathing inconsistencies. (#725) +* fix: provide description and meaning to parameters in markdown -* fix: Corrections to fix merge - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Update tests for drawio functionality. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Initial set of tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Initial set of tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Temp patch for testing - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: update changes to fix merge to clean up functionality. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correct validator behaviour - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correcting doctags - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correcting doctags - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Updated comments / errors. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Updated comments / errors. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`1ea7f63`](https://github.com/oscal-compass/compliance-trestle/commit/1ea7f63549ad1f74a47572fb00f04f42bce2e5ab)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Correct merge (including repository functionality) and improve merge cwd handling. (#724) +* fix: undo unneded removal to pass test cases -* fix: Corrections to fix merge - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Update tests for drawio functionality. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a780e2c`](https://github.com/oscal-compass/compliance-trestle/commit/a780e2ca16f8e5ca99a74e8167b6ccb66c3e91e1)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Unknown +* fix: ordering list of parameter values displayed in markdown -* Merge pull request #729 from IBM/develop +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -chore(release): Bug fixes and enabling caching for import ([`1f1598e`](https://github.com/oscal-compass/compliance-trestle/commit/1f1598eae114e4b6223cc09e162ad770dfd7bf69)) +--------- +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`266f67b`](https://github.com/oscal-compass/compliance-trestle/commit/266f67bd220e15922caacb4de0e702f4d0927ceb)) -## v0.23.0 (2021-09-03) +### Unknown + +* Merge pull request #1445 from IBM/develop + +chore: Trestle release ([`73e125d`](https://github.com/oscal-compass/compliance-trestle/commit/73e125ded8cccada508fe7466ecd328847483b8f)) + +## v2.2.1 (2023-07-05) ### Chore -* chore: regen oscal with new datamodel-codegen and make develop (#714) +* chore: Merge back version tags and changelog into develop. ([`e9dad2b`](https://github.com/oscal-compass/compliance-trestle/commit/e9dad2b7888332a6cf63b82670946f9492f27023)) -* re run gen-oscal after make develop - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added comment - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`60973b8`](https://github.com/oscal-compass/compliance-trestle/commit/60973b8134cbd724763c5b3b14dc7e2c28f1f9c2)) +### Fix -* chore: Clean up issue templates. (#707) +* fix: parameter value default is never required (#1419) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9f6db2d`](https://github.com/oscal-compass/compliance-trestle/commit/9f6db2daf3cbe942bbf5133ff03e450bd5c42f75)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`01434f1`](https://github.com/oscal-compass/compliance-trestle/commit/01434f13b16054b035767985a9a02ed9fa91154f)) -* chore: Merge back version tags and changelog into develop. ([`7a994f3`](https://github.com/oscal-compass/compliance-trestle/commit/7a994f31d8113403bf5b3ab750a1b1659d6318ae)) +* fix: pydantic 2.0.0 break unit tests (#1418) -### Feature +* fix: pydantic 2.0.0 break unit tests -* feat: Update of Oscal profile to osco from initial PoC with stakeholder review. +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* feat/oscal-profile-to-osco-yaml-rev2 - -* Comments. - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`c47092a`](https://github.com/oscal-compass/compliance-trestle/commit/c47092aecf0d4b73eef2147738832748ecb04b1a)) +* fix minimum pydantic version -* feat: resolved profile catalog functionality and enhanced ssp generation (#694) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -* initial changes prior to pull. - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* now creating basic resolved profile catalog - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* now prune controls - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* clean up a bit - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix: Documentation fixes as well as fixes to json serializisation for full utf-8 support. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* now good except for unicode - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* ssp now matches, added warning for odd files during validate - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweak validate - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tidy ssp - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* initial pipeline for generating resolved catalog - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* cascaded profiles do correct selection - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* modify mostly working - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* all seems ok - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* all tests pass - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* ssp generation looks good - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* Typo - -* added more recursion - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed sections being dropped - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* clarify part text for ssp assemble - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* ssp now doesnt overwrite - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* increase coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix: Corrected issues from inconsistent versions of mdformat including in the CI pipeline. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* added complex profile with depth - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added test profile c - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweaked doc text - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* clean up ssp a bit - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* chore: Fixing code formatting after merge conflict. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* addressed review requests. - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* typing generators as iterators - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`193e3b9`](https://github.com/oscal-compass/compliance-trestle/commit/193e3b9e8179d3be0b5eaa4692e9106c5e4ad628)) +--------- -* feat: Add new OSCAL profile-to-osco-yaml transformer functionality. (#677) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`2138831`](https://github.com/oscal-compass/compliance-trestle/commit/2138831f9bb36c5f91ab17cccc4412128c468a82)) -* OSCAL profile to osco yaml transformer - -* Fix unit test description. - -* Fix import of text_files_equal. - -* Address reviewer suggestions and other improvements - -- change default output filename to osco-profile.yaml -- fix interface types -- fix incorrect comments -- return json string, not dict -- set new or default values on class creation -- reduce size of test data - -* fix: Updated href to the nist 800-53 catalog. - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`c7e2156`](https://github.com/oscal-compass/compliance-trestle/commit/c7e2156b9cc2546d15a70e7699091465c8a54e91)) +* fix: adding parameter aggregation from other parameter values for given control (#1412) -* feat: Adding rich model generation to trestle add and trestle create. (#693) +* feat: adding parameter aggregation functionality -* feat: Adding optional argument to allow richer model generation to trestle add and trestle create - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Refactoring more tests to take advantage of monkeypatch. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Improved tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Extra unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Improved documentation. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correct md issues. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9d32953`](https://github.com/oscal-compass/compliance-trestle/commit/9d329530893da01de1b71dce8711fa3edb1fc2cb)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat: Adding capability to allowing generator to generate optional fields. (#690) +* fix: fix code complexity -* feat: Adding capability to allow gOscal Generator to generate optional fields - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Clean up arguments. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Clean up arguments. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`4a0f631`](https://github.com/oscal-compass/compliance-trestle/commit/4a0f6318b426e24a2764e0a75edcaa84861cadd8)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Fix +* fix: reduce code complexity -* fix: Refactor underlying methods to isolate calls to Path.cwd() (#716) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Refactor underlying methods to isolate calls to cwd - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Cleaned up unit tests and command docstrings. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Cleaned up unit tests and command docstrings. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Further code clean up. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`473c1d8`](https://github.com/oscal-compass/compliance-trestle/commit/473c1d8ca85e688bd75362a3f0f22e8cc81c327d)) +* fix: add parameters for test cases and reduce code complexity -* fix: Cleanup assemble command to reduce LoC covering the same functionality. (#709) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`c40cfca`](https://github.com/oscal-compass/compliance-trestle/commit/c40cfca85af92c6e5d6c725ea069db4d534676f9)) +* fix: fixing tests merge -### Unknown +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* Merge pull request #717 from IBM/develop +* fix: correct code lint -feat: Trestle release ([`e0aacad`](https://github.com/oscal-compass/compliance-trestle/commit/e0aacadc3706f86ad86fd27c7df26a2e2b2425ec)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +--------- -## v0.22.1 (2021-08-19) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`7b8cad0`](https://github.com/oscal-compass/compliance-trestle/commit/7b8cad03e05024a406742720e5abed2e3febdf6f)) -### Chore +* fix: assessment objectives formatting in markdown is not correct (#1414) -* chore: Merge back version tags and changelog into develop. ([`639a9c1`](https://github.com/oscal-compass/compliance-trestle/commit/639a9c1fdbc7257457065d753beed8ac82fe0486)) +* fix: assessment objectives formatting in markdown is not correct -### Fix +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Strip back dependencies due to dependency error (#684) +* fix: remove unneded variable -* fix: Updating developer docs on CI workflow - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Additional documentation details - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: removed dependencies that are causing conflicts. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: removed dependencies that are causing conflicts. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a8b4768`](https://github.com/oscal-compass/compliance-trestle/commit/a8b476859cbc3ba77f9bf389ed2bb977bd80c592)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Updating developer docs to include details on the CI workflow. (#683) +--------- -* fix: Updating developer docs on CI workflow - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Additional documentation details - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e8d63e1`](https://github.com/oscal-compass/compliance-trestle/commit/e8d63e1ddcfb9bf1b179de195bb86b7af7758fe3)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> ([`dbfc1d6`](https://github.com/oscal-compass/compliance-trestle/commit/dbfc1d6c59339a7f542f86cb74da4f05fe8a9a60)) ### Unknown -* Merge pull request #686 from IBM/develop - -fix: Trestle release ([`8d76b52`](https://github.com/oscal-compass/compliance-trestle/commit/8d76b5259782f7a8782df3491c391cc77472220b)) +* Merge pull request #1420 from IBM/develop +chore: Trestle release ([`2a0d40f`](https://github.com/oscal-compass/compliance-trestle/commit/2a0d40fada48b6263e6ce738ec94d930e94c4607)) -## v0.22.0 (2021-08-13) +## v2.2.0 (2023-06-26) ### Chore -* chore: Merge pull request #679 from IBM/develop +* chore: Merge back version tags and changelog into develop. ([`1037c8e`](https://github.com/oscal-compass/compliance-trestle/commit/1037c8e35a31528a2610160a68f46f999e36d170)) -feat: Trestle release ([`6582a5c`](https://github.com/oscal-compass/compliance-trestle/commit/6582a5cb20ff092763beb5059fbb8c34dd712b79)) +### Documentation -* chore: Adding google analytics to website (#680) +* docs: update maintainers list (#1394) ([`c53faa4`](https://github.com/oscal-compass/compliance-trestle/commit/c53faa40ce23a5ad5476cbb6e2c3d32a8e6818dc)) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`4375ab9`](https://github.com/oscal-compass/compliance-trestle/commit/4375ab92fca03a699cdd788c0bfe01b9a60a45c0)) +### Feature -* chore: Merge back version tags and changelog into develop. ([`1ba9815`](https://github.com/oscal-compass/compliance-trestle/commit/1ba9815b75b82ee04acffbea4c1532fdd0f1feb4)) +* feat: add profile-inherit command (#1392) -### Feature +* test: adds testdata for profile init tests -* feat: Schema validate command including miscellaneous fixes. (#665) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* chore: Initial skeleton - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Clean up of text_files_equal (#664) - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Working on unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Complete basic Unit tests - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Cleaning up code. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Removing target model from scope - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: adding testing. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Added remaining unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Adding the missing files. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Added extra documentation. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Addressed issues in review - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Adding more unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`3ab088a`](https://github.com/oscal-compass/compliance-trestle/commit/3ab088a9a9b4927a660510fe6fe8438a9b48fdfa)) +* feat(cli): adds profile-seed command -* feat: new command href and now ssp gen uses caching to pull catalog from remote (#669) +Adds profile-seed as author subcommand +Adds profile-seed unit test +Adds SSP testdata -* first reworking of cache. tests pass - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* have expiration working. - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added test - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* improved uri handling and tests - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added new command href - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* ssp gen works via cache - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* increased coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix unix test failures - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* more href tests and fixes based on pr feedback - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boost coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix docstrings - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* windows drive path issue - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docs for href and now dont cache local hrefs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated cli.md - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated href text 3 - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed changes to pre-commit for mdformat - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fix: Correct missing/bad mdformatted documents and add mdformat to pre-commit. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`660ef47`](https://github.com/oscal-compass/compliance-trestle/commit/660ef47b48d17ce19ab31690ef8264afb085e326)) +Closes #1388 -### Fix +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: Improved error handling of yaml headers in markdown files. (#676) +* chore: updates flag wording in profile.py -* chore: Initial skeleton - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Clean up of text_files_equal (#664) - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Working on unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Complete basic Unit tests - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Cleaning up code. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Removing target model from scope - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: adding testing. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Added remaining unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Adding the missing files. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Added extra documentation. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Addressed issues in review - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Improved error handling of yaml header. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Adding more unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Covering bad yaml headers with testing. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Covering bad yaml headers with testing. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Bad md header. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`1983925`](https://github.com/oscal-compass/compliance-trestle/commit/198392543a864ab213d869ddeaa123817d69b3c2)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: Documentation fixes as well as fixes to json serializisation for full utf-8 support. (#674) +* test: adds test case for profile-seed -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d051638`](https://github.com/oscal-compass/compliance-trestle/commit/d0516381a8be4d4c97c14395965ade00f8181083)) +Adds additional test case to check for ids output +when all controls are filtered out -* fix: relocate ParameterHelper class. (#667) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`0dbf472`](https://github.com/oscal-compass/compliance-trestle/commit/0dbf472c5d3513fb85d66e4f76bb3bc037fc726f)) +* test: updates description leveraged ssp testdata -* fix: file compare issue in task xlsx-to-component-definition unit test (#666) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* Fix file compare issue in task xlsx-to-component-definition unit test - -trestle version increases with each release, which affects the produced -output but not in any material way with respect to the unit tests at -hand. - -fix is to employ local function to get_trestle version which nominally -returns the actual trestle version, but to mock said function in the -unit test. - -* fix: file compare issue in task xlsx-to-component-definition unit test - -* Use trestle version 0.21.0 in compare data, same as parameter-helper -fix. ([`052d184`](https://github.com/oscal-compass/compliance-trestle/commit/052d184a1cb5b83e034e7f2bc7c8a240299f7b6e)) +* docs: updates author and tutorial docs with information on profile-seed command +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -## v0.21.0 (2021-07-30) +* chore: updates command to profile-inherit in docs and code -### Chore +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* chore: Further improvements to testing performance (#662) +* feat: adds excluded controls to the profile-inherit generated profile -* chore: Improving testing performance in CICD - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Further scleaning of CICD to optimise performance - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Further scleaning of CICD to optimise performance - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e281fa9`](https://github.com/oscal-compass/compliance-trestle/commit/e281fa936fbd232e36825e4609585c4e669f6ca7)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* chore: Improving testing performance for the CICD pipeline(#661) +* docs: adds JSON example of profile-inherit import to website docs -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`83abe2d`](https://github.com/oscal-compass/compliance-trestle/commit/83abe2dd8a74c818cfac5e45b4e2900cb609c423)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* chore: Merge back version tags and changelog into develop. ([`4e1bb9f`](https://github.com/oscal-compass/compliance-trestle/commit/4e1bb9fee0ccc67f2be27693eb28b3707e1fe888)) +* chore: adds PR feedback on styling -### Documentation +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* docs: Cross link documentation between compliance-trestle and compliance-trestle-demos repositories. (#637) +--------- -* feat: Added demonstration content. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Cleaned up demo content. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Removed dupicate demos. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`f28aca1`](https://github.com/oscal-compass/compliance-trestle/commit/f28aca1073888a7575a277c819449302e8e52b23)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`3bd53ff`](https://github.com/oscal-compass/compliance-trestle/commit/3bd53ff370cece77fc78082dbc04304af12c6647)) -### Feature +* feat: oscal-catalog-to-csv (#1396) -* feat: Trestle Release #659 from IBM/develop +* feat: oscal-catalog-to-csv -feat: Trestle release ([`6329c82`](https://github.com/oscal-compass/compliance-trestle/commit/6329c82ddd59e2699bd6e7dc8cd571e948fa21f6)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* feat: describe command to describe contents of model files with optional element path (#650) +* Populate testing spot checks. -* added describe.py file - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* initial describe parsing - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* describe mostly working - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added comments - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added test file - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added typing for docstrings - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* more docstring fixes - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boost coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* wrong test docstring - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* more tests and enhancements - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* initial documentation for describe - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* updated docs for split and describe - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added new md doc files - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* check for commas and added to docs for describe - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`905ff8a`](https://github.com/oscal-compass/compliance-trestle/commit/905ff8ac3cb0c7f11a8d8601bbcbcb2f9b40cae0)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* feat: spread sheet to component definition (#635) +* fix validate -* spread sheet to OSCAL component definition task - -* spread sheet to OSCAL component definition task - -* Merge with develop, minor fixes. - -* Add missing column specs to -i output. - -* Relocate references to IBM and SCC from code to config. - -* Remove hard-coded NIST values, relocate to config file. - -* Use from trestle.utils.fs import text_files_equal - -* Fix flake8. - -* Remove the copy of the nist 800-53 catalog. - -* Remove the copy of the nist 800-53 catalog. - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* flake8, but no complaint on my laptop? - -* Fix bare except. - -* Fix bare except. - -Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> - -* linter fixes. - -* linter fixes. - -* Reduce size of main execute function. - -Size of for loop reduced to 28 lines, including comments. -Minor bug fix in output catalog. - -* Fix test spreadsheets. - -- remove hidden and unused columns -- delete ods file - -* To identify column use heading (row 1) rather than letter. - -* Cosmetic fix to doc (for tanium-to-oscal). - -* Remove unused column and between blank columns from "good" spread sheet. - -Also, remove corresponding heading check from code. - -* Document trestle task xlsx-to-oscal-component-definition. ([`6fe4e22`](https://github.com/oscal-compass/compliance-trestle/commit/6fe4e22ce9235e95ccd73c836bc8cbedfa99799c)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -### Fix +* Use 'w' for output file open. -* fix: ssp dropping section prose when in profile, now supporting profile & catalog section prose. (#657) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* fixed section issue in ssps - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added docs - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* boost coverage - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`4eadf47`](https://github.com/oscal-compass/compliance-trestle/commit/4eadf475dc0ccd0f38bd365b9b71be90e6f98cce)) +* fix windows csv. -* fix: ssp section generation failed due to changes due to 1.0.0 (#649) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* fixed ssp section generation - changes due to 1.0.0 - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* tweaked doc string - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`26dac34`](https://github.com/oscal-compass/compliance-trestle/commit/26dac345c65a59ef49f49af11dbacb1f2094ceb4)) +* Fix sonar complaints + improved test coverage -* fix: split bugs and make -f optional (#639) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* split working except for parent issue - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* split working - needs cleanup - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* cleaned up and fixed compdef props issue - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* fixed rel path split issue - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* renamed respository refs - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* start split with no -f - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* split with no file works - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* updated docs - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* boost coverage - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* fix lint issue - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* made requested changes from pr feedback. - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed split issues with new repository - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* converted TLO to TopLevelOscalModel - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* fixed extra variable assignment - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -* added try/except for test chdir - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`c514301`](https://github.com/oscal-compass/compliance-trestle/commit/c51430175117e1c1071442d3c564fae4afcef461)) +* Fix sonar complaint. -* fix: Cleanup and enhancement of linting. (#636) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* fix: Improved linting - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Improved linting - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`631eba9`](https://github.com/oscal-compass/compliance-trestle/commit/631eba9ac1795bfcd109ed0e840898c2e6101528)) +* Improve test coverage. +Signed-off-by: degenaro <lou.degenaro@gmail.com> -## v0.20.0 (2021-07-16) +* 100% test coverage. -### Chore +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* chore: Merge back version tags and changelog into develop. ([`7656043`](https://github.com/oscal-compass/compliance-trestle/commit/7656043d4311f909b2fc3fa82ffe1d930a36c787)) +--------- -### Feature +Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`5f59a7f`](https://github.com/oscal-compass/compliance-trestle/commit/5f59a7fc7cf8b88a9f77ba4554dd493acff67114)) -* feat: Adding a global option to trestle author headers. (#628) +* feat: adds control origination to ssp-filter (#1375) -* feat: Adding a global option to trestle author headers. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Added some unit tests for trestle author. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Added tests for missing coverage. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Updated docs. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`16f0265`](https://github.com/oscal-compass/compliance-trestle/commit/16f0265b1296066a203a5f844d89fd642a00fdb6)) +* feat(cli): adds logic to filter ssp by control origination -* feat: Repository APIs to allow developer a consistent interface to a trestle repo. (#583) +Adds test to test one and multiple control origination value inputs +Adds test to test bad control origintation value input +Adds filtering logic to ssp.py -* Added Repo APIs and set trestle root in main command - -* implementing read for managedOSCAL - -* fix init validation in commad_docs - -* fix: Restructured command inherhitence to ensure trestle-root is found. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Completed ManagedOSCAL class implementation - -* removed __main__ from trestle_repo - -* Updated tests for trestle_root - -* Moved trestle_repo.ps to trestle/core/repository.py ans some other cleanup - -* Update fs.py - -Small typo error. - -Co-authored-by: Vikas <avikas@in.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`7bfabc5`](https://github.com/oscal-compass/compliance-trestle/commit/7bfabc5a9e078cbfb6b190d3ccb7f06942d9ea37)) +Closes #1361 -### Fix +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: Added test cases for Repository code (#625) +* docs: updates trestle author docs with ssp-filter changes for control origination -* Added test cases for Repository code - -* updated comment - -* added more test cases - -* updated tests - -* updated test - -* updated repository split code and tests - -Co-authored-by: Vikas <avikas@in.ibm.com> ([`c3f8a33`](https://github.com/oscal-compass/compliance-trestle/commit/c3f8a339bb66ea4723c9b1fa7b7ef30edf275cb5)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: split catalog star, enable split of model with wildcard (#626) +* fix: updates control origination flag value in ssp.py -* split nearly working - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* split star seems ok - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* boosted coverage - split star seems fine - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* cleaned up, about to pull develop - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* added doc - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* fixed error in docstring - -Signed-off-by: fsuits <frankst@au1.ibm.com> ([`d17389e`](https://github.com/oscal-compass/compliance-trestle/commit/d17389e824ce8f33f2a091cd541622fb40513a37)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix: tutorial tweaks (#623) +* fix: adds break to remove duplicate implemented requirements -* added editing of files in test of ssp assemble - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* improved handling of prose for implementations in ssp assemble - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* boost coverage - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* tweaks to the tutorial - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* explicit download of catalog file from nist github. - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* fixed backslash - -Signed-off-by: fsuits <frankst@au1.ibm.com> ([`3ab018d`](https://github.com/oscal-compass/compliance-trestle/commit/3ab018d6dd63ae4ee98d90daca9b5580687ac8ae)) +When filtering for control origination, the property could be +specified more than one time. This change adds a break and changes +to the test component defintion to ensure this case is covered. -* fix: Add gfm support for mdformat (#620) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`f67a74c`](https://github.com/oscal-compass/compliance-trestle/commit/f67a74c63aedd1cabdb6fcfd8f5be99b25886949)) +--------- -* fix: ssp assemble prose, all extraction of general prose for responses (#618) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> ([`509afa7`](https://github.com/oscal-compass/compliance-trestle/commit/509afa7df124f8a6c3516ad06db256777baaef98)) -* added editing of files in test of ssp assemble - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* improved handling of prose for implementations in ssp assemble - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* boost coverage - -Signed-off-by: fsuits <frankst@au1.ibm.com> ([`06e8627`](https://github.com/oscal-compass/compliance-trestle/commit/06e862705bbf3880678324ba29e4be54e54322e6)) +### Fix -* fix: boost coverage fix split_too_fine (#615) +* fix: drop python 3.7 support as required -* improved test coverage, fixed split_too_fine, removed dict queries that arent needed - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* removed exception check in validate - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* reworked split_too_fine to deal with pydantic collection classes - -Signed-off-by: fsuits <frankst@au1.ibm.com> - -* improved typing and simplified multiple ifs to try except - -Signed-off-by: fsuits <frankst@au1.ibm.com> ([`891227b`](https://github.com/oscal-compass/compliance-trestle/commit/891227b9899b38f7ce609f8b4b715740cb9a84f7)) +Adding extra steps to run builds on optional for 3.7.16 on macos latest and 3.7 for windows and ubuntu ([`cf4160b`](https://github.com/oscal-compass/compliance-trestle/commit/cf4160bc25336cb9362150906a8aaeda308c4134)) -### Unknown +* fix: Change the community call to use bluejeans events (#1400) -* Merge pull request #629 from IBM/develop +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`9380cc8`](https://github.com/oscal-compass/compliance-trestle/commit/9380cc813f8b044640fecb4ee302207d3c66d29a)) -feat: Release of trestle repository functionality ([`4135275`](https://github.com/oscal-compass/compliance-trestle/commit/4135275e0874d1a5107e5494075c7ef4bae2d9f7)) +* fix: python 3.7.17 issue (#1408) +* fix: python 3.7.17 issue -## v0.19.0 (2021-07-06) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -### Chore +* fix: python 3.7.17 issue -* chore: [ImgBot] Optimize images (#609) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> -*Total -- 343.57kb -> 285.47kb (16.91%) - -/3rd-party-schema-documents/IBM_assessment_result_interchange_SCC/Unification-SCC-class-for-OSCO-and-Tanium-to-OSCAL.png -- 171.79kb -> 142.74kb (16.91%) -/docs/reference/Unification-SCC-class-for-OSCO-and-Tanium-to-OSCAL.png -- 171.79kb -> 142.74kb (16.91%) - -Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com> - -Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> ([`d6f5148`](https://github.com/oscal-compass/compliance-trestle/commit/d6f514882934b895d4f1c3b22cf1d5e63288d95f)) +--------- -* chore: Merge back version tags and changelog into develop. ([`18d4d38`](https://github.com/oscal-compass/compliance-trestle/commit/18d4d385dd1a4ba743a59811d199ab7dd1109820)) +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> ([`6849c3b`](https://github.com/oscal-compass/compliance-trestle/commit/6849c3b01d0adfd1261b9929a7d5c1866dd38973)) -### Feature +* fix: log warning for duplicate part ids when writing markdown from json (#1395) -* feat: Merge pull request #611 from IBM/develop +* fix: use empty string if part prose is None -feat: Support for OSCAL 1.0.0 ([`0e9a4c5`](https://github.com/oscal-compass/compliance-trestle/commit/0e9a4c51f75470c202efa53b625e3181bd31254c)) +Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> -* feat: remove validate mode option and yaml_header optional in ssp-gen (#607) +* test: add test for checking no prose in part -* fixed ssp assemble - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* updated doc - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fixed error checking blank line - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* yaml header now optional in ssp-generate - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* removed validate -mode - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fully removed validate mode and updated docs - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fixed problem with missing header and now check all optional class members for None - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* clean up statement labels to satisfy regex in ssp-assemble - -Signed-off-by: frank <freestar8n@yahoo.com> - -* provide text for params when value not given. Add statement id to the Add description text - -Signed-off-by: frank <freestar8n@yahoo.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> -Co-authored-by: frank <freestar8n@yahoo.com> ([`3a5e104`](https://github.com/oscal-compass/compliance-trestle/commit/3a5e104d100feaad5334e8ee3231bdd6e93bbf82)) +Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> -* feat: restore oscal write to use windows newlines on windows (#608) +* fix: write warning instead of exit with code 1 when duplicate parts -* restored oscal_write to use windows newlines on windows and removed dep. on filecmp - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* modified comment - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b7d8345`](https://github.com/oscal-compass/compliance-trestle/commit/b7d83458a233204b52e4271ee908392870992d5c)) +Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> -* feat: Remove target model from trestle with OSCAL 1.0.0 release (#595) +--------- -* feat: Remove target v1 - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Pre-merge commit. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Clean up UT's / formatting - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Remove docs references to target definition. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Remove typos and other issues identified in PR review. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Remove bad comments - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ececd37`](https://github.com/oscal-compass/compliance-trestle/commit/ececd3792281b08bf26831acee1254bd24338815)) +Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> ([`760dd4b`](https://github.com/oscal-compass/compliance-trestle/commit/760dd4b4dd6ac405df3db0c2d39d9973ab61a0f4)) -* feat: Ingestion of XML and other improvements for the OSCO transformer. (#586) +* fix: use empty string if prose in part is None while writing to markdown (#1390) -* 0.18.1 - -Automatically generated by python-semantic-release - -* feat: oscal normalize major changes to support new OSCAL 1.0.0 (#577) - -* removed nist modules - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* reloaded nist - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added oscal_normalize - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* first new oscal with common - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* tests now load - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* tmpdir -> tmp_path, fixed Model in files - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added lous fixes to transformers - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* more fixes for new oscal - 25 fail 379 pass - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix: Consolidate UUID sample and sample fix for POAM forward refs. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fixed ordering issue in oscal files - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix to poam forward - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix: Correct typing of assertion with OSCAL model changes. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fixed split compdef and updated split data up to including step2 - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* updated data in step3 of splitmerge - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added more files from split merge workflow - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* more fixes to data files. 11 fails - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* improved add tests, started updating profile for ssp. 10 failures. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix: Correct generator behaviour - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* ssp tests now pass - fixed simple profile for 1.0.0 - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fixed add and replicate failures - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fixed validate failure - replaced tests using target to use catalog instead - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fixed 2 import failures - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* removed test for load_dict, removed test for split too fine - all tests pass - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* boost validate test coverage - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* hooked oscal_normalize into gen_oscal and refined split of common files. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* now include oscal dir for yapf formatting. This commit is only a format change. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> - -* ingest xml and other improvements for OSCO transformer - -- enable ingestion of xml -- add target_type -- remove name & node -- improve test cases - -* Fix typo. - -Co-authored-by: semantic-release <semantic-release> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`f555f1e`](https://github.com/oscal-compass/compliance-trestle/commit/f555f1e1607edde8b6fc67d03b7804d28a0a345f)) +* fix: use empty string if part prose is None -* feat: oscal normalize major changes to support new OSCAL 1.0.0 (#577) +Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> -* removed nist modules - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* reloaded nist - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added oscal_normalize - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* first new oscal with common - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* tests now load - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* tmpdir -> tmp_path, fixed Model in files - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added lous fixes to transformers - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* more fixes for new oscal - 25 fail 379 pass - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix: Consolidate UUID sample and sample fix for POAM forward refs. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fixed ordering issue in oscal files - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix to poam forward - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix: Correct typing of assertion with OSCAL model changes. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fixed split compdef and updated split data up to including step2 - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* updated data in step3 of splitmerge - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added more files from split merge workflow - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* more fixes to data files. 11 fails - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* improved add tests, started updating profile for ssp. 10 failures. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix: Correct generator behaviour - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* ssp tests now pass - fixed simple profile for 1.0.0 - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fixed add and replicate failures - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fixed validate failure - replaced tests using target to use catalog instead - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fixed 2 import failures - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* removed test for load_dict, removed test for split too fine - all tests pass - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* boost validate test coverage - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* hooked oscal_normalize into gen_oscal and refined split of common files. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* now include oscal dir for yapf formatting. This commit is only a format change. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`fd7e137`](https://github.com/oscal-compass/compliance-trestle/commit/fd7e137d0cc19527754e1e6a25c2361f9338a513)) +* test: add test for checking no prose in part -### Fix +Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> -* fix: remove incorrect scc_check_version in tanium transformer (#591) +--------- -* fix: remove incorrect scc_check_version - -* Fix doc per Chris Butler's review. - -* Policy Validation Points, spelling. - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`4c59eda`](https://github.com/oscal-compass/compliance-trestle/commit/4c59edacfcacef2921711642776126a9b4e6a386)) +Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`5427fbb`](https://github.com/oscal-compass/compliance-trestle/commit/5427fbb445e9a54a2ede1caa7e15c15b8977dd10)) -* fix: duplicate oscal classes and reordered. oscal_write line ending (#592) +* fix: some tests failing on linux (#1387) -* fixed duplicate oscal classes and reordered. oscal_write specifies unix line ending. increased test coverage. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added documentation - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`ddaeece`](https://github.com/oscal-compass/compliance-trestle/commit/ddaeecebbf884f7b96509e3c75d798f65472278a)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`f0ffdec`](https://github.com/oscal-compass/compliance-trestle/commit/f0ffdecb963d7cd341b6b40be3a02efd3e76748d)) -* fix: Ensure line endings do not change (#593) +* fix: update readme with webex details (#1383) ([`4263f1a`](https://github.com/oscal-compass/compliance-trestle/commit/4263f1a72fa9a3ebea01b3b5c301cf89a962bf9c)) -* fix: Ensure line endings do not change - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Scope git config to only the CICD user. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correct config scope. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`82fcab3`](https://github.com/oscal-compass/compliance-trestle/commit/82fcab3ea5e4b06b6ff31a6e2749b30729cfd48d)) +### Unknown +* Merge pull request #1399 from IBM/develop -## v0.18.1 (2021-06-17) +chore: Trestle release ([`c3c28de`](https://github.com/oscal-compass/compliance-trestle/commit/c3c28de55120dc36988db1c3df95c3249ca5a26c)) + +## v2.1.1 (2023-05-12) ### Chore -* chore: Merge back version tags and changelog into develop. ([`2b987f9`](https://github.com/oscal-compass/compliance-trestle/commit/2b987f99f3f8bd3c4b36aec071887e7f4766882c)) +* chore: Trestle release -### Fix +chore: Trestle release ([`312203b`](https://github.com/oscal-compass/compliance-trestle/commit/312203b8c5eff6b50068a97b8f9be90ccb463438)) -* fix: Small scale fixes to the author validation system. (#572) (#573) +* chore: improve typing for mypy checks (#1350) -* fix: Minor fixes of author capability - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Adding more unit tests - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Added test fixtures. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Remove redundant statement. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`04e16cc`](https://github.com/oscal-compass/compliance-trestle/commit/04e16ccd508607eadb2c0ab4db69fb324cf0e24c)) +* initial typing fixes -* fix: Small scale fixes to the author validation system. (#572) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* fix: Minor fixes of author capability - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Adding more unit tests - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Added test fixtures. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Remove redundant statement. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`8cd2232`](https://github.com/oscal-compass/compliance-trestle/commit/8cd22323c0b0bcb556c15fa3bb91d4a7c36bb683)) +* phase 2 typing fixes +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -## v0.18.0 (2021-06-17) +* 20 files do not pass -### Chore +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* chore: Merge back version tags and changelog into develop. ([`f98a852`](https://github.com/oscal-compass/compliance-trestle/commit/f98a852b6782f0c0760b1aab8a30eeef16039085)) +* fixed lists -### Feature +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* feat: Allow explicit inclusion / exclusion of readme files in author workflows (#570) +* tweak -* feat: Optional flags for readme validation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Added missing test files. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`0ca1d20`](https://github.com/oscal-compass/compliance-trestle/commit/0ca1d202fa4865acf20fb9156a9c13437350b16e)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -### Fix +* made requested changes -* fix: Replace yaml library to ensure that errors are thrown / recognised on duplicate keys. (#569) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* chore: Moderniing to ruamel.yaml - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Bad testing data - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Replace yaml library with modernized and safe yaml library - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Fixing missing code format / linting. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Corrected behaviour in UT's by forcing file flush in oscal_write - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Correct docs setup. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: For content flushing / IO issues. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: More YAML IO sync issues - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9464420`](https://github.com/oscal-compass/compliance-trestle/commit/9464420cb3bba1dc684051ff35e2d13e9a115203)) +--------- -### Unknown +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`041fa46`](https://github.com/oscal-compass/compliance-trestle/commit/041fa46690673eb82e5da711888ab57e801048b5)) -* Trestle release - update prior to OSCAL 1.0.0 support. +* chore: Merge back version tags and changelog into develop. ([`c4c972c`](https://github.com/oscal-compass/compliance-trestle/commit/c4c972cd8694257af10c3f2159f8a954e0b4c4b3)) -Pre OSCAL 1.0.0 release ([`797a291`](https://github.com/oscal-compass/compliance-trestle/commit/797a2918dbbe4771ae950364c560c4561216b011)) +### Documentation +* docs: update community call webex link (#1366) -## v0.17.0 (2021-06-09) +* docs: update community call webex link -### Chore +Signed-off-by: manjiree-gadgil <manjiree.gadgil@ibm.com> -* chore: Correct expression path. +* docs: update community call webex link -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9378863`](https://github.com/oscal-compass/compliance-trestle/commit/9378863861270f67fe16d6a6e4891d2856a55878)) +Signed-off-by: manjiree-gadgil <manjiree.gadgil@ibm.com> -* chore: readding comments. +* docs: address mdformat modification -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`4a45cff`](https://github.com/oscal-compass/compliance-trestle/commit/4a45cff3485039681643ba7eb52f3a41a5ff739f)) +Signed-off-by: manjiree-gadgil <manjiree.gadgil@ibm.com> -* chore: CICD refinements +--------- -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`c09119c`](https://github.com/oscal-compass/compliance-trestle/commit/c09119ce80c38b4d4d966e80a420ef7e0731131c)) +Signed-off-by: manjiree-gadgil <manjiree.gadgil@ibm.com> +Co-authored-by: AleJo2995 <alejandro.leiva.palomo@ibm.com> ([`d5da18d`](https://github.com/oscal-compass/compliance-trestle/commit/d5da18d8f64fc0328d1b6592f663554c8aed3c22)) -* chore: Merge back version tags and changelog into develop. ([`2f88d60`](https://github.com/oscal-compass/compliance-trestle/commit/2f88d60d0f599778d5005c636c7a404c385c0071)) +* docs: add community call information ([`b6d6451`](https://github.com/oscal-compass/compliance-trestle/commit/b6d6451408b79171021e00d883132eed1f5871b6)) -### Feature +### Fix -* feat: ssp generation of markdown files for groups of controls (#556) +* fix: change lint title action (#1352) -* added ssp_generator and test - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added section output and separate file for md_writer - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* ssp now a command and improved tests - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added docs for ssp - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* clean up and boost coverage - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added comments - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* initial ssp creation - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* now output ssp json - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* made requested changes for ssp generation - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* changed add to get in func name - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* split ssp into ssp-generate and ssp-assemble - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`1dcf139`](https://github.com/oscal-compass/compliance-trestle/commit/1dcf1395469b20b32e67c02cc52ede15d5b35f4b)) +* test bad pr title action change -* feat: Update `trestle md` to `trestle author` and introduce functionality for validating drawio metadata. (#551) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat: renamed md to author to prepare for drawio content - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Ensure mkdocs must update successfully - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* hello - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: reorganisation of code to clean up - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Cleanup of the codebase as exists to meet formatting / linting. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: More cleanup - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Significant cleanups of markdown (now author) codebase. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Code formatting was missing. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Add missing test files - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: Finish basic implementation of header validation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Cleanup documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: Added documentation for author and enforce utf-8 everywhere - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Complete unit testing for author headers - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Added missing unit tests for DrawIOMetadataValidator - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Adding more unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Corrected drawio behaviour where it was not raising an exception - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Additional fixes - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added missing dependencies - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* adding utility functions - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Removed google analytics which no longer is supported. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Cleaned up reporting - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Small documentation updates. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`2567e6c`](https://github.com/oscal-compass/compliance-trestle/commit/2567e6c55039ce4b2db0d76fb4ae3c7495a26301)) +* fix: adding current branch to run pr title action -### Fix +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Lint PR firing off dev (#562) +* fix: changing settings for conventional pr title check -* fix Lint PR firing off dev - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Added small set of updates - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`81f44c6`](https://github.com/oscal-compass/compliance-trestle/commit/81f44c628d687ab4f0d96b9c16d018459e9fc062)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: [ImgBot] Optimize images (#560) +* fix: chaning pr lint flow -*Total -- 1,247.86kb -> 604.94kb (51.52%) - -/docs/assets/drawio_editing_data.png -- 558.20kb -> 257.90kb (53.8%) -/docs/assets/drawio_data_menu.png -- 663.19kb -> 321.66kb (51.5%) -/docs/tutorials/continuous-compliance/ContinuousCompliance.jpg -- 26.46kb -> 25.38kb (4.11%) - -Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com> - -Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> ([`62b870d`](https://github.com/oscal-compass/compliance-trestle/commit/62b870d3d98bf2a67be2c7fc68b0cf9e8d4b7f07)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Allow for check suite to trigger a PR +* fix: correct permissions on folders -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`5c95318`](https://github.com/oscal-compass/compliance-trestle/commit/5c95318f8c43b6901d0992512e029d2aa584a73c)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Allow for check suite to trigger a PR +* fix: adding sudo to apt install -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9bce041`](https://github.com/oscal-compass/compliance-trestle/commit/9bce041a02326d9e148ada7271eda5dbda46e504)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Allow for test completion to trigger automerge correctly +* fix: adding correct branch -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`dc6864f`](https://github.com/oscal-compass/compliance-trestle/commit/dc6864f8a3bc03ec1f694d25dbeda19969507ab9)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: correct github expression path. +* fix: correcting typo -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9ab4936`](https://github.com/oscal-compass/compliance-trestle/commit/9ab4936dc0aef7d4b2bd445dd4d8f1e3a13c6f9b)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Ensrue automerge fires off correctly +* fix: correcting branch -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d0f51b8`](https://github.com/oscal-compass/compliance-trestle/commit/d0f51b841073d06269272f2e5f5a7f04bb07bc3a)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: CICD refinements +* fix: add step to check -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a2d836b`](https://github.com/oscal-compass/compliance-trestle/commit/a2d836bc8e29d6cbe16346ed4172e258546e1196)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Dump context in automerge workflow. +* bad pr title test (#1356) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`144a54f`](https://github.com/oscal-compass/compliance-trestle/commit/144a54f8ef51252b4a4fec6117e85b388cd69b17)) +* bad pr title test -* fix: Cleanup CIDC workflow to prevent admin rights pushing over checks. +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`56127e7`](https://github.com/oscal-compass/compliance-trestle/commit/56127e733dc0539d36e3faf32be1c3be701da1d8)) +* spacing -* fix: Cleanup CIDC workflow to prevent admin rights pushing over checks. +* fix: adding sudo to apt install -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a305ebb`](https://github.com/oscal-compass/compliance-trestle/commit/a305ebb24c8595a0014afe1d6da5886400f1211b)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Cleanup CIDC workflow to prevent admin rights pushing over checks. +* adding space -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`31e8cde`](https://github.com/oscal-compass/compliance-trestle/commit/31e8cde6b68009372a7dcf9562dc6e420ecec6d2)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Unknown +* change readme -* Merge pull request #561 from IBM/develop ([`da34485`](https://github.com/oscal-compass/compliance-trestle/commit/da344851f6b373e19f900899c64f147eb08d7ff9)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* Merge pull request #552 from IBM/fix/cicd_cleanup ([`48d537b`](https://github.com/oscal-compass/compliance-trestle/commit/48d537bedc40f5127dba008f72fc63e5b4897457)) +* Update README.md -* Merge branch 'develop' into fix/cicd_cleanup ([`7b099c6`](https://github.com/oscal-compass/compliance-trestle/commit/7b099c65a8843fb33aaf9a89d7c0f6081c54fda2)) +* Update README.md +--------- -## v0.16.0 (2021-05-28) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Chore +* fix: fixing action condition -* chore: Merge back version tags and changelog into develop. ([`a463460`](https://github.com/oscal-compass/compliance-trestle/commit/a46346082a8c98d85354fcb0e51b0c63d9d60b0f)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Feature +* fix: correct conditional -* feat: OSCO transformer conform to Results interface class. (#532) ([`fc251b9`](https://github.com/oscal-compass/compliance-trestle/commit/fc251b9e9c231de67fd214b16bdd7c2a6cb4d3c1)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat: functionaly complete +* fix: add config conventional install -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`b7c903b`](https://github.com/oscal-compass/compliance-trestle/commit/b7c903b703c78026ac14e31177cd4e3a7541d469)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Fix +* fix: adding commitlint config -* fix: move unreachable debug statement +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> ([`f5b9c1a`](https://github.com/oscal-compass/compliance-trestle/commit/f5b9c1a029e6257c789ebc573105b582dca23e1b)) +* fix: chaning branch to checkout -* fix: move unreachable debug statement ([`0ce9c24`](https://github.com/oscal-compass/compliance-trestle/commit/0ce9c24a8fcc5e464f4194970e82740e6c0cd4f1)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Complete coverage of drawio class +* add validation just for title -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`225403c`](https://github.com/oscal-compass/compliance-trestle/commit/225403c4f85ca77cb322bb9620992ab0c6673e9b)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Adding basic UT suite for drawio. +* fix: grab the first commit msg -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`44cc8c3`](https://github.com/oscal-compass/compliance-trestle/commit/44cc8c3fcb57bb23743fbe12d5bc180bf13edab5)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Corrected errors +* fix: adding config -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`8187d6d`](https://github.com/oscal-compass/compliance-trestle/commit/8187d6d5932669dddd676e68c24fe0d058703d52)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: correcting errors +* fix: add pull request event -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`5bfedac`](https://github.com/oscal-compass/compliance-trestle/commit/5bfedac6575d3e57ea530b0e69e55ebbcbb26c37)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: improve devops to stop squash merging to main (#542) ([`a8313fb`](https://github.com/oscal-compass/compliance-trestle/commit/a8313fbf75b8c8eb5d2791b2dadafc1be03cc492)) +* fix: correct action workflow -### Unknown +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* Merge pull request #550 from IBM/develop ([`736d2d4`](https://github.com/oscal-compass/compliance-trestle/commit/736d2d4130210a571eacf36a24403b4a26c570e5)) +* fix: remove message -* Merge pull request #549 from IBM/fix/split_roles ([`11add07`](https://github.com/oscal-compass/compliance-trestle/commit/11add074c00c9d96dbe8a493976e61e55961624c)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fixed incorrect comment line +* fix: adding merge commit to check -Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`0ccd64e`](https://github.com/oscal-compass/compliance-trestle/commit/0ccd64ef75d79a7e088fc16e39397bba3c452a19)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix to bug splitting roles and compdefs. Better handling of lists and dicts in splits +* fix: geting latest commit -Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`d17a8f9`](https://github.com/oscal-compass/compliance-trestle/commit/d17a8f94447494dfb523a75c04a0d06f89d234fe)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* Merge pull request #539 from IBM/feat/drawio-metadata ([`20b848b`](https://github.com/oscal-compass/compliance-trestle/commit/20b848b903e529dec99177163220a4aa7e23624f)) +* fix: setup default branch -* Merge develop into feat/drawio-metadata ([`f47d7a6`](https://github.com/oscal-compass/compliance-trestle/commit/f47d7a65a62c54f0a54ced213d73db596d5d5bbb)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* Merge pull request #546 from IBM/fix/split-debug-txt ([`e98af5e`](https://github.com/oscal-compass/compliance-trestle/commit/e98af5e18a452079db7fbca65731122df3029e69)) +* fix: fixing syntax error -* Merge branch 'develop' into feat/drawio-metadata ([`265cb91`](https://github.com/oscal-compass/compliance-trestle/commit/265cb91a89ee681f0701659c91d19bbf95120e3c)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* move unreachable debug statement ([`b104a3d`](https://github.com/oscal-compass/compliance-trestle/commit/b104a3d4a30952615bbfe906e3a42dc03aa9c07f)) +* fix: inverting commit order -* Merge branch 'develop' into feat/drawio-metadata ([`7278618`](https://github.com/oscal-compass/compliance-trestle/commit/72786181d8b00a536b1e98d0ba34ce6f5f919c47)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +* fix: commitlint config -## v0.15.1 (2021-05-20) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Chore +* fix: fixing typo -* chore: Added drawio UTs +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`56aabeb`](https://github.com/oscal-compass/compliance-trestle/commit/56aabeb427962c450c0252653d42f0a9de7555e8)) +* fix: correcting typo -* chore: Release to main to update documentation (#537) ([`ecd5a58`](https://github.com/oscal-compass/compliance-trestle/commit/ecd5a589f82e1c8cc2d8fb576ab413643c88f5f7)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: clean bad data files and improve all_validator feedback (#536) ([`2cb9d7c`](https://github.com/oscal-compass/compliance-trestle/commit/2cb9d7ceb093b1071cbd2184d6191aa07a49f3bd)) +* fix: fixing typo -* chore: update tools and models for 914 (#534) ([`163043f`](https://github.com/oscal-compass/compliance-trestle/commit/163043fa6837ded959a63f3de13c0cac12022b80)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Updated some docs to trigger a PR (#523) +* fix: missing install -* chore: Updated some docs to trigger a PR - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: there is a mistake in the workflow syntax - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`6c4ad8c`](https://github.com/oscal-compass/compliance-trestle/commit/6c4ad8cefd7e3b6b69f4838611eec0ccdcb20f01)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Clean up PR automation (#521) +* fix: adding corrections -* chore: DevOps automation for PRs +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> +* fix: match pr title -* Experiment with pr helper +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> +* fix: add validation step -* Experiment with pr helper +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> +* fix: correct action -* chore: cleanup CICD pipelines to help remove duplication +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> +* fix: change pr title check steps -* chore: cleanup CICD pipelines to help remove duplication +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> +* fix: adding correct config -* chore: cleanup CICD pipelines to help remove duplication +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> +* fix: fix mdformat errors in readme -* chore: cleanup CICD pipelines to help remove duplication +* fix: target main and develop branches -Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Specify explicitly action versions +--------- -Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +Co-authored-by: manjiree-gadgil <manjiree.gadgil@ibm.com> ([`5444206`](https://github.com/oscal-compass/compliance-trestle/commit/5444206f8b8c8e6904ec180472c569e246255975)) -* fix: revised filtering to decrease the number of runs +* fix: docs for task xlsx-result-to-oscal-ar replacing "osco" (#1369) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`35ce91a`](https://github.com/oscal-compass/compliance-trestle/commit/35ce91a65543255ce053633ade0543bfcdf02223)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`850ed0a`](https://github.com/oscal-compass/compliance-trestle/commit/850ed0a99e0298496b0df1e91c22bd80c290b6e1)) -* chore: CICD improvements (#518) +* fix: ssp response missing status and rules (#1358) -* chore: DevOps automation for PRs +* quiet warning about system comp status -Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* chore: DevOps automation for PRs +* added docstring -Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* Added cache to github actions to accelerate workflow. +* added ssp md rules and status -Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* Added cache to github actions to accelerate workflow. +* updated ssp tutorial regarding the ssp demo -Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* chore: change versions +* added options -Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* chore: change versions +* fixed ssp parameter substitution -Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* Clean up build process +--------- -Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`43daf5f`](https://github.com/oscal-compass/compliance-trestle/commit/43daf5f9fca2495c1dbb8fa2ea39cb7184a9e191)) -* fix: Conventional PR +* fix: xccdf to oscal-ar (#1336) -Signed-off-by: Chris Butler <chris@thebutlers.me> +* fix: xccdf to oscal-ar -* fix: Conventional PR +Signed-off-by: degenaro <lou.degenaro@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> +* make docs -* fix: Conventional PR +Signed-off-by: degenaro <lou.degenaro@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> +* Fix code smells. -* fix: Change automerge tooling +Signed-off-by: degenaro <lou.degenaro@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> +* Fix code smells. -* fix: Change automerge tooling +Signed-off-by: degenaro <lou.degenaro@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> +* Fix code smells. -* Experiment with pr helper +Signed-off-by: degenaro <lou.degenaro@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> +* Agreed upon changes for transformation of xccdf to OSCAL AR -* Experiment with pr helper +Signed-off-by: degenaro <lou.degenaro@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> +--------- -* Experiment with pr helper +Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`7305883`](https://github.com/oscal-compass/compliance-trestle/commit/730588327ea54a5fc7a5d1f597a3ffeee92e0e48)) -Signed-off-by: Chris Butler <chris@thebutlers.me> +* fix: Handle tabs in statement prose and parts (#1359) -* Experiment with pr helper +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`c34dbea`](https://github.com/oscal-compass/compliance-trestle/commit/c34dbeaa7dd75cd614393c57cba97fa9e5c8d699)) -Signed-off-by: Chris Butler <chris@thebutlers.me> +* fix: quiet warning about system component status as operational (#1354) -* Experiment with pr helper +* quiet warning about system comp status -Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* Experiment with pr helper +* added docstring -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`64c95cd`](https://github.com/oscal-compass/compliance-trestle/commit/64c95cd21816919d702aac72863e89f5d020c007)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* chore: Merge back version tags and changelog into develop. ([`4d0acd4`](https://github.com/oscal-compass/compliance-trestle/commit/4d0acd466cd82d370c0e018f4f1d05e7bc303c45)) +--------- -### Documentation +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`4313b85`](https://github.com/oscal-compass/compliance-trestle/commit/4313b850403e49a1db8e00f91e264e89e3175238)) -* docs: Reorg and cleanup content (#531) ([`380e924`](https://github.com/oscal-compass/compliance-trestle/commit/380e92476ff63126df470f31a4e8e0190e608fad)) +* fix: Raise error if duplicate parts are found in the control statement (#1351) -* docs: Updated third party schema as per latest tanium to oscal conversion and added it to documentation (#527) ([`9feb690`](https://github.com/oscal-compass/compliance-trestle/commit/9feb6908c80c3873cf310079144fbbbe20002c54)) +* fix: Raise error if duplicate parts are found in statement -* docs: More google style doc strings (#526) ([`28914f0`](https://github.com/oscal-compass/compliance-trestle/commit/28914f088a78b57fdfb090eda662ea5c8b362884)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* docs: Addtional documentation. (#525) ([`516f01e`](https://github.com/oscal-compass/compliance-trestle/commit/516f01eb0eff580bcfc95ea7b0909cd0ebdb8221)) +* fix: Make lint happy -* docs: Small set of document updates (#524) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* docs: Small set of document updates - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Update again - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: more cleaning and error logging - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`7b339d7`](https://github.com/oscal-compass/compliance-trestle/commit/7b339d7e81d0a2e626bc29c7718d0e1081996fbb)) +* Remove unnecessary logging -### Feature +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* feat: oscal version validator (#528) ([`2b132d5`](https://github.com/oscal-compass/compliance-trestle/commit/2b132d5f09832452def258284bb40090d32bab01)) +--------- -* feat: create title - place names in title of created objects - issue #473 (#519) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`74bd4f5`](https://github.com/oscal-compass/compliance-trestle/commit/74bd4f5e33c6d863fca3753955971ad460cac74a)) -* upgrade pydantic to 1.8.2 for security issue +* fix: update author jinja command and add test (#1347) -Signed-off-by: FrankSuits <frankst@au1.ibm.com> +* update author jinja command and add test -* Simple change to insert model name in created objects. +Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> -Signed-off-by: FrankSuits <frankst@au1.ibm.com> +* run yapf -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b676ed3`](https://github.com/oscal-compass/compliance-trestle/commit/b676ed379b4328f3b69fe1806a7dad46ccc5319a)) +Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> -### Fix +* resolve flake8 D205 and D400 -* fix: Trigger release (#540) ([`aeffa5b`](https://github.com/oscal-compass/compliance-trestle/commit/aeffa5b5aa1609b23fdbfed7d167068e366f72e9)) +Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> -* fix: Remove problematic concurrency restrictions in devops pipeline (#538) ([`5181c70`](https://github.com/oscal-compass/compliance-trestle/commit/5181c70b44e283a21b4fedb05ecc36590d04c319)) +--------- -* fix: stop split at strings, better handling of component-def splits (#506) ([`43c9edd`](https://github.com/oscal-compass/compliance-trestle/commit/43c9edd790579a7000a444a703b2d30a485480d1)) +Signed-off-by: Sharma-Amit <Sharma.Amit@ibm.com> ([`a0b1797`](https://github.com/oscal-compass/compliance-trestle/commit/a0b17972d82e106500f69dbfa78f86b8cf2da085)) -* fix: Correct bad syntax in devops tooling. ([`dcec2ea`](https://github.com/oscal-compass/compliance-trestle/commit/dcec2eaeacff7e7ad981e801255c844a37446390)) +### Unknown -* fix: Ensure PR automation system cannot override checks. (#522) +* fix typo in task help text (#1365) -* chore: DevOps automation for PRs - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Experiment with pr helper - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Experiment with pr helper - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: cleanup CICD pipelines to help remove duplication - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: cleanup CICD pipelines to help remove duplication - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: cleanup CICD pipelines to help remove duplication - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: cleanup CICD pipelines to help remove duplication - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Specify explicitly action versions - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: revised filtering to decrease the number of runs - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: TSetting up automerge that respects permissions - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: TSetting up automerge that respects permissions - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Remove aconcurrency restriction from matrix build jobs. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Remove aconcurrency restriction from matrix build jobs. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Remove aconcurrency restriction from matrix build jobs. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`5817316`](https://github.com/oscal-compass/compliance-trestle/commit/5817316ff06cecba6b3662b96cb77655aa70277b)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`cbfa849`](https://github.com/oscal-compass/compliance-trestle/commit/cbfa849beda8b3bc42d6bc2ef8c07faa2cc559ca)) -* fix: Correct semantic / conventional commit behaviour (#520) +## v2.1.0 (2023-04-06) -* chore: DevOps automation for PRs +### Chore -Signed-off-by: Chris Butler <chris@thebutlers.me> +* chore: Refactor control reader Part 2 (#1330) -* Experiment with pr helper +* chore: Refactor the processing of editable parts -Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* Experiment with pr helper +* Adjust typing for 3.8 -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a6f7d01`](https://github.com/oscal-compass/compliance-trestle/commit/a6f7d013998e0a198347d987558f7974e372b5ea)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -### Unknown +* Simplify code -* Merge branch 'main' into develop ([`8aa6b82`](https://github.com/oscal-compass/compliance-trestle/commit/8aa6b828bfaaf9f9bceb50da13de271a7d3b954b)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> +* Process code blocks in the markdown prose correctly -## v0.15.0 (2021-05-13) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -### Chore +* Address review comments -* chore: Merge back version tags and changelog into develop. ([`d6cf057`](https://github.com/oscal-compass/compliance-trestle/commit/d6cf0576e4408d349f0a156e4e0d70ff76f60378)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -### Feature +* Adjust warning and docs -* feat: Added error checking and enforce 1 to 1 keys in header validation (#512) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* added error checking and enforce 1 to 1 keys in yaml validation - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added test - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* key test - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added header-only validation - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* header validation for gov folders - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added dir recursion for gov header validate - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`da95862`](https://github.com/oscal-compass/compliance-trestle/commit/da958620ffca76cbfae1762159a7ca51007c8b88)) +--------- -* feat: Role ID cross reference validator and refactors to validators to allow all +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`4a18b57`](https://github.com/oscal-compass/compliance-trestle/commit/4a18b57a0b4ab8888c4e266eac1b4a058d863b13)) -* added role id refs validation and refactored validators - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* renamed and added validator files - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added check for item name and made roleid name more consistent - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* removed -item validator option, added all validator, import now validates all - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`c894704`](https://github.com/oscal-compass/compliance-trestle/commit/c894704875ae54e8376fb50d62cd064f1d293b66)) +* chore: Refactoring of control reader to a new type of markdown node (Part 1) (#1317) -* feat: Roleid validation via ncname and parametrized tests (#499) +* chore: Refactor control reader to a new control markdown node -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`84dc9a2`](https://github.com/oscal-compass/compliance-trestle/commit/84dc9a293e35f1c4010a38c7ecc8f99e5fa7dfb2)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -### Fix +* chore: Update docs -* fix: Upgrade pydantic to 1.8.2 for security issue (#513) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* upgrade pydantic to 1.8.2 for security issue - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* Constrain markupsafe to the correct version - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Constrain markupsafe to the correct version - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Constrain markupsafe to the correct version - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`6e01f36`](https://github.com/oscal-compass/compliance-trestle/commit/6e01f36cc6fdfd8b14d453f470968ad7ea4164fa)) +* Address sonar problems -* fix: Remove problematic code-QL plugin which is causing problems. (#507) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`47529a7`](https://github.com/oscal-compass/compliance-trestle/commit/47529a7714f0c99bb711033ca1863651de99dbf5)) +* Add timeout on the get call -### Unknown +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* Merge pull request #517 from IBM/develop +--------- -Release: Security update and gov header only scanning. ([`da99cfe`](https://github.com/oscal-compass/compliance-trestle/commit/da99cfe0b3a769eba3ec6fdb0ad2e3d63aa9d72d)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`2a43576`](https://github.com/oscal-compass/compliance-trestle/commit/2a43576d824a860451b95fe0ffb8c300d0137c78)) -* feat:Tanium converged format updated to IBM SCC format (#515) +* chore: Merge back version tags and changelog into develop. ([`a1b1743`](https://github.com/oscal-compass/compliance-trestle/commit/a1b17432d413097958dac1be86ff0153694ddc9b)) -* Tanium converged format - -Signed-off-by: Lou DeGenaro <degenaro@li-dd41d84c-35a5-11b2-a85c-eb5d345ed15a.ibm.com> - -* Revise doc. - -Signed-off-by: Lou DeGenaro <degenaro@li-dd41d84c-35a5-11b2-a85c-eb5d345ed15a.ibm.com> - -* fix: Upgrade pydantic to 1.8.2 for security issue (#513) - -* upgrade pydantic to 1.8.2 for security issue - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* Constrain markupsafe to the correct version - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Constrain markupsafe to the correct version - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Constrain markupsafe to the correct version - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Chris Butler <chris@thebutlers.me> -Signed-off-by: Lou DeGenaro <degenaro@li-dd41d84c-35a5-11b2-a85c-eb5d345ed15a.ibm.com> - -Co-authored-by: degenaro <degenaro@localhost> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b2b0db6`](https://github.com/oscal-compass/compliance-trestle/commit/b2b0db6584f985b0c0d634f08c43e835b41e6a6b)) +### Documentation +* docs: fix refs to version numbers and update docs (#1326) -## v0.14.4 (2021-04-22) +* updated docs -### Chore +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* chore: Merge back version tags and changelog into develop. ([`6c5e7b1`](https://github.com/oscal-compass/compliance-trestle/commit/6c5e7b1ef8dbf1b8e17c1fdf2ebf64c605779fcb)) +* added warning for ssp compdefs -### Fix +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* fix: Add timestamp to tanium-to-oscal transformer (#503) +* removed warning -* Feat/tanium scc (#493) - -* Tanium transformer revisions - -- add add components -- change namespace -- use agreed upon class identifiers and remove others -- use statement-id -- add end time -- list controls in verbose mode -- manage "pocket" for missing computer-name - -* Update tanium-to-oscal tutorial - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* Feat/tanium scc 2 (#497) - -* Tanium transformer revisions - -- add add components -- change namespace -- use agreed upon class identifiers and remove others -- use statement-id -- add end time -- list controls in verbose mode -- manage "pocket" for missing computer-name - -* Update tanium-to-oscal tutorial - -Co-authored-by: degenaro <lou.degenaro@gmail.com> - -* Feat/tanium observation timestamp (#502) - -* Add timestamp property to each observation. - -* Add timestamp property to each observation. - -* Update tutorial to include timestamp property. - -Co-authored-by: Chris Butler <chris@thebutlers.me> -Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`e8dc204`](https://github.com/oscal-compass/compliance-trestle/commit/e8dc204935b5d1f4584bcaaef77bba2c41d80a9f)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -### Unknown +--------- -* Feat/tanium observation timestamp (#502) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`525f0f8`](https://github.com/oscal-compass/compliance-trestle/commit/525f0f80de39dfe230ab3d95486533ab72473980)) -* Add timestamp property to each observation. - -* Add timestamp property to each observation. - -* Update tutorial to include timestamp property. ([`688bc35`](https://github.com/oscal-compass/compliance-trestle/commit/688bc350f0afba47a3122a18fe66304d2732eaff)) +### Feature +* feat: validate SSP rule parameter values (#1337) -## v0.14.3 (2021-04-20) +* sketched rules validator and test -### Chore +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* chore: Merge back version tags and changelog into develop. ([`17cd61c`](https://github.com/oscal-compass/compliance-trestle/commit/17cd61c3a8d024af06b7620fffb61e51c40c37a9)) +* feat: Rules parameter values validation in SSP -### Fix +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: tanium updates for scc, 2 (#498) +* fix: correct parameter name on docstrings for rules_validator function -* Feat/tanium scc (#493) - -* Tanium transformer revisions - -- add add components -- change namespace -- use agreed upon class identifiers and remove others -- use statement-id -- add end time -- list controls in verbose mode -- manage "pocket" for missing computer-name - -* Update tanium-to-oscal tutorial - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -* Feat/tanium scc 2 (#497) - -* Tanium transformer revisions - -- add add components -- change namespace -- use agreed upon class identifiers and remove others -- use statement-id -- add end time -- list controls in verbose mode -- manage "pocket" for missing computer-name - -* Update tanium-to-oscal tutorial - -Co-authored-by: degenaro <lou.degenaro@gmail.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> -Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`9b9b61e`](https://github.com/oscal-compass/compliance-trestle/commit/9b9b61e6236da2f15cd6fc125925c6e4e708465f)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Unknown +* fix: correct value returned by val_diff_param_values function -* Feat/tanium scc 2 (#497) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* Tanium transformer revisions - -- add add components -- change namespace -- use agreed upon class identifiers and remove others -- use statement-id -- add end time -- list controls in verbose mode -- manage "pocket" for missing computer-name - -* Update tanium-to-oscal tutorial - -Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`bd12c27`](https://github.com/oscal-compass/compliance-trestle/commit/bd12c274afd30aab55ca41afcad3ed37da5f52e3)) +* fix: getting rid of nist updates +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -## v0.14.2 (2021-04-20) +* fix: initial logic handling for ssp -### Chore +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Merge back version tags and changelog into develop. ([`2ce5be2`](https://github.com/oscal-compass/compliance-trestle/commit/2ce5be2a1a0469bf4ec0e77acabf84e29ff6c6fa)) +* feat: adding rule param values validation for SSP -* chore: Merge back version tags and changelog into develop. ([`76092cd`](https://github.com/oscal-compass/compliance-trestle/commit/76092cd547ff82cb2d33f882319dd509d5778242)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Merge back version tags and changelog into develop. ([`1956a42`](https://github.com/oscal-compass/compliance-trestle/commit/1956a426896aca92aa2e7688c9f41b9f1ae4086b)) +* fix: addressing code changes -### Fix +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: tanium enhancements for scc +* fix: correcting tests -* Tanium transformer revisions - -- add add components -- change namespace -- use agreed upon class identifiers and remove others -- use statement-id -- add end time -- list controls in verbose mode -- manage "pocket" for missing computer-name - -* Update tanium-to-oscal tutorial - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> -Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`8bae421`](https://github.com/oscal-compass/compliance-trestle/commit/8bae421df04a7683bccc52ea40420bb85d4bcebe)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Unknown +* fix: reducing conginitve complexity -* Revert "Feat/tanium scc (#493) (#494)" (#495) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -This reverts commit 98109ce27e4a9ff4917ba7bcb99790ed02a58963. ([`7ccaf35`](https://github.com/oscal-compass/compliance-trestle/commit/7ccaf3568da532066b02c31e7050ca265d6dde58)) +* fix: addressing new changes -* Feat/tanium scc (#493) (#494) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* Tanium transformer revisions - -- add add components -- change namespace -- use agreed upon class identifiers and remove others -- use statement-id -- add end time -- list controls in verbose mode -- manage "pocket" for missing computer-name - -* Update tanium-to-oscal tutorial - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> -Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`98109ce`](https://github.com/oscal-compass/compliance-trestle/commit/98109ce27e4a9ff4917ba7bcb99790ed02a58963)) +* fix: changing tests logic and addressing final changes -* Feat/tanium scc (#493) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* Tanium transformer revisions - -- add add components -- change namespace -- use agreed upon class identifiers and remove others -- use statement-id -- add end time -- list controls in verbose mode -- manage "pocket" for missing computer-name - -* Update tanium-to-oscal tutorial - -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`264966c`](https://github.com/oscal-compass/compliance-trestle/commit/264966c2b8b20da315179fbf9cee5dd13aefb3ed)) +* fix: cleaning test files +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -## v0.14.1 (2021-04-16) +* fix: remove unneded validation -### Chore +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Merge back version tags and changelog into develop. ([`840c73a`](https://github.com/oscal-compass/compliance-trestle/commit/840c73a6edec203b7dd35bac804b098469e68f41)) +* fix: fixing typo in validation -### Fix +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Chore/fs cleanup (#489) +* fix: cleaning old ssp and generating new one for test -* cleanup of fs.py to allow relative and absolute paths - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* global change of absolute() to resolve() - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added debug lines and exception handling - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* better resolve handling, updated docs, silenced stack trace, added debug lines - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fixed docs typos - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`bf8be03`](https://github.com/oscal-compass/compliance-trestle/commit/bf8be03fc62e56928e8f92cfe746b004e0c54b71)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Unknown +* fix: full debug logs on test -* Merge pull request #492 from IBM/develop +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Release to main: essential fixes to file IO ([`6be5246`](https://github.com/oscal-compass/compliance-trestle/commit/6be5246b530a6613f7af8cf5ad1ba689d8806f0b)) +* fix: directory handling for setup ssp test +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -## v0.14.0 (2021-04-15) +* fix: applying changes for tests to pass on rule params validator -### Chore +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Update pre-commit markdown formatting (#476) +* fix: cleaning up old and unused code -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`89946e6`](https://github.com/oscal-compass/compliance-trestle/commit/89946e6458958343193f0d66f6af94d5b38ef69e)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Merge back version tags and changelog into develop. ([`c31cfa0`](https://github.com/oscal-compass/compliance-trestle/commit/c31cfa07b868cdff44ec125b6bcdde6bf5dd5f96)) +* fix: adressing few minor changes to format and code -### Feature +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat: Release of enhanced markdown functionality ([`f327fd6`](https://github.com/oscal-compass/compliance-trestle/commit/f327fd67131c90afbe6c3644ab41b0dc56412b78)) +* fix: optimizing logig for rule params validator -* feat: Assessment result schema updates(#481) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* changed print to logger - -* Added experiments profiling setup - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* added flah to benchmark with or without json serialization - -* readme file for assessment. result object - -* changed prinet to logger - -Signed-off-by: Vikas <avikas@in.ibm.com> - -* feat: Update NIST models to latest including refactors & UT's - -* feat:Update Oscal version - -Signed-off-by: Chris Butler <chris@thebutlers.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 <frankst@au1.ibm.com> - -* removed ssp validate test - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fixed code format - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix:Reworking generators - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* cleaned up gen-oscal.py and regenerated the oscal models. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> -Co-authored-by: degenaro <lou.degenaro@gmail.com> -Signed-off-by: Vikas <avikas@in.ibm.com> - -* 0.11.0 - -Automatically generated by python-semantic-release - -Signed-off-by: Vikas <avikas@in.ibm.com> - -* feat:Improved serialisation support for OscalBaseModel (#454) - -* feat:Improved serialization support. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Serializing by appropriate key and minimizing file size. - -Signed-off-by: Chris Butler <chris@thebutlers.me> -Signed-off-by: Vikas <avikas@in.ibm.com> - -* Feat:transformer factory (#455) - -* initial prototype of transformer factory - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added singleton transformer factory - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added base transformer class - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* more fixes and added tests - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added test for transform factory - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* restructured, added more docs and tests. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* removed bad file names. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix:Typing information - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Chris Butler <chris@thebutlers.me> -Signed-off-by: Vikas <avikas@in.ibm.com> - -* 0.12.0 - -Automatically generated by python-semantic-release - -Signed-off-by: Vikas <avikas@in.ibm.com> - -* Added experiments profiling setup - -Signed-off-by: Chris Butler <chris@thebutlers.me> -Signed-off-by: Vikas <avikas@in.ibm.com> - -* added flah to benchmark with or without json serialization - -Signed-off-by: Vikas <avikas@in.ibm.com> - -* readme file for assessment. result object - -Signed-off-by: Vikas <avikas@in.ibm.com> - -* feat: Update of OSCAL schema to 1.0.0-rc2 (#465) - -* feat:Update core OSCAL schema - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Corrected OSCAL version in the docs - -Signed-off-by: Chris Butler <chris@thebutlers.me> -Signed-off-by: Vikas <avikas@in.ibm.com> - -* fix: Cleanup of fs.py to allow relative and absolute paths (#464) - -* cleanup of fs.py to allow relative and absolute paths - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* global change of absolute() to resolve() - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> -Signed-off-by: Vikas <avikas@in.ibm.com> - -* feat: Tanium to oscal tranform refactored to exploit the ResultsTransformer interface (#466) - -* ResultsTransformer interface - -* remove trestle.utils.tanium - -* remove trestle.utils.tanium.py - -* added registration of tanium transformer - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added name for registration - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> -Co-authored-by: FrankSuits <frankst@au1.ibm.com> -Signed-off-by: Vikas <avikas@in.ibm.com> - -* 0.13.0 - -Automatically generated by python-semantic-release - -Signed-off-by: Vikas <avikas@in.ibm.com> - -* fix:Corrected transforms behaviour and added example script. (#468) - -Signed-off-by: Chris Butler <chris@thebutlers.me> -Signed-off-by: Vikas <avikas@in.ibm.com> - -* 0.13.1 - -Automatically generated by python-semantic-release - -Signed-off-by: Vikas <avikas@in.ibm.com> - -* chore: Update pre-commit markdown formatting (#476) - -Signed-off-by: Chris Butler <chris@thebutlers.me> -Signed-off-by: Vikas <avikas@in.ibm.com> - -* fix:Moved directories to fix testing errors. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Moved directories to fix testing errors. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chnaged benchmark to use transform API - -* removed script reslted to thrid party - exchange protocol, observations and their tests - -* fix:Perf tuning of OscalBaseModel serialization. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Mkdocs automation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Mkdocs automation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Vikas <avikas@in.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> -Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Co-authored-by: degenaro <lou.degenaro@gmail.com> -Co-authored-by: semantic-release <semantic-release> -Co-authored-by: FrankSuits <frankst@au1.ibm.com> ([`0f5c4ee`](https://github.com/oscal-compass/compliance-trestle/commit/0f5c4eedb0eaa1afcc2f11cfca026e840cbfac37)) +--------- -* feat: trestle markdown updates (#477) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`10dd58b`](https://github.com/oscal-compass/compliance-trestle/commit/10dd58b552f8f9a4618daea27e6d0ccd002dbd80)) -* chore: Commit for merge workflow - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Adding more unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Adding more unit tests and documentation. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ddc2420`](https://github.com/oscal-compass/compliance-trestle/commit/ddc2420ff71dae6fcb6597654d69dbd16fba8cb6)) +* feat: adds implementation status to ssp-filter (#1338) +* docs: updates trestle author docs with ssp-filter changes -## v0.13.1 (2021-04-13) +Adds ssp-filter by implementation status -### Chore +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* chore: Merge back version tags and changelog into develop. ([`10d6634`](https://github.com/oscal-compass/compliance-trestle/commit/10d663499c617fdea797e5d92810bcc0b55e5ec5)) +* feat(cli): adds logic to filter ssp by implementation status -* chore: Merge back version tags and changelog into develop. ([`7dd62f4`](https://github.com/oscal-compass/compliance-trestle/commit/7dd62f4ca10fc7f4f2e21411741e3ffb1d827508)) +- Adds test to test one and multiple implmentations status imputs +- Adds test to test bad implementation status input +- Adds filtering logic to ssp.py -### Fix +Closes #1332 -* fix: Force release. +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -fix: Force release ([`0e90265`](https://github.com/oscal-compass/compliance-trestle/commit/0e90265c7192979a613c30abd3561a68b612d8ac)) +* chore: updates ssp-filter test for updated compdef testdata -### Unknown +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* Minor release: Fix behaviour of trestle transforms +* docs: updates wording on ssp-filter tutorial doc -Minor release: Fix behaviour of trestle transforms ([`02d23b5`](https://github.com/oscal-compass/compliance-trestle/commit/02d23b5ed0a7e68c8b3a74cc8b50e1fe76ba8315)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -* fix:Corrected transforms behaviour and added example script. (#468) +* chore: updates comment in ssp-filter test -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`7f05800`](https://github.com/oscal-compass/compliance-trestle/commit/7f0580042842663f39c8c221a890c6e77ac700da)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> +* refactor: updates ssp.py to use pre-defined constants and rewords errors -## v0.13.0 (2021-04-13) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> -### Chore +--------- -* chore: Merge back version tags and changelog into develop. ([`78fc812`](https://github.com/oscal-compass/compliance-trestle/commit/78fc812965797e676629c8afde132011a4abd94b)) +Signed-off-by: Jennifer Power <barnabei.jennifer@gmail.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`c33fc7d`](https://github.com/oscal-compass/compliance-trestle/commit/c33fc7d2ac9b430349962a08263db94c660a5f1c)) -### Feature +* feat: remove root references (#1316) -* feat: Tanium to oscal tranform refactored to exploit the ResultsTransformer interface (#466) +* updated gen_oscal and submodules for oscal 1.04 -* ResultsTransformer interface - -* remove trestle.utils.tanium - -* remove trestle.utils.tanium.py - -* added registration of tanium transformer - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added name for registration - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> -Co-authored-by: FrankSuits <frankst@au1.ibm.com> ([`6fced57`](https://github.com/oscal-compass/compliance-trestle/commit/6fced57a5c011aafb26220e94b038ebae884b20d)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat: Update of OSCAL schema to 1.0.0-rc2 (#465) +* conversion completed all tests pass -* feat:Update core OSCAL schema - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Corrected OSCAL version in the docs - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`4e2f64d`](https://github.com/oscal-compass/compliance-trestle/commit/4e2f64dd5a4f80f4081c0168b0e669b97dab79c8)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -### Fix +* fixed makefile -* fix: Cleanup of fs.py to allow relative and absolute paths (#464) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* cleanup of fs.py to allow relative and absolute paths - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* global change of absolute() to resolve() - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`1407911`](https://github.com/oscal-compass/compliance-trestle/commit/140791190569e5673a216fe8dfdffc35d6c2424e)) +* fixed .gitmodules -### Unknown +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Release to update to OSCAL 1.0.0-rc2 +* simplified makefile -Release to update to OSCAL 1.0.0-rc2 ([`5f6c05d`](https://github.com/oscal-compass/compliance-trestle/commit/5f6c05d7cd3f79d4303689872e22d0f5b66a4c28)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +* more string consts -## v0.12.0 (2021-04-09) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -### Chore +* more details in oscal_normalize.py -* chore: Merge back version tags and changelog into develop. ([`e3d7f69`](https://github.com/oscal-compass/compliance-trestle/commit/e3d7f698caa3a99a7e484ed4d0ff6c87c2ef5497)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -### Feature +* added mapping class after manual edit -* feat: Release of transformation factory interface for beta testing. +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Release of transformation factory interface for beta testing. ([`a036522`](https://github.com/oscal-compass/compliance-trestle/commit/a0365226175adfd38c5e37d863c4c50038a1658c)) +* added mapping model -### Unknown +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Feat:transformer factory (#455) +* can now import mapping models -* initial prototype of transformer factory - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added singleton transformer factory - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added base transformer class - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* more fixes and added tests - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* added test for transform factory - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* restructured, added more docs and tests. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* removed bad file names. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix:Typing information - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`a5c86fd`](https://github.com/oscal-compass/compliance-trestle/commit/a5c86fd374a9cfc96859c22f8056dddefb3607e5)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat:Improved serialisation support for OscalBaseModel (#454) +* pulled from develop and updated docs -* feat:Improved serialization support. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Serializing by appropriate key and minimizing file size. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`b87f158`](https://github.com/oscal-compass/compliance-trestle/commit/b87f158d9b1f54a3fc68857d7732ceb8a2f830df)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +* fixed typing -## v0.11.0 (2021-04-08) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -### Chore +* fixed mapping-collection -* chore: Merge back version tags and changelog into develop. ([`ee17ea5`](https://github.com/oscal-compass/compliance-trestle/commit/ee17ea5524fd56e92698d6f7e0106d48c55c66c8)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -### Feature +* root removed -* feat: Update NIST models to latest including refactors & UT's +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat:Update Oscal version - -Signed-off-by: Chris Butler <chris@thebutlers.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 <frankst@au1.ibm.com> - -* removed ssp validate test - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fixed code format - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix:Reworking generators - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* cleaned up gen-oscal.py and regenerated the oscal models. - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> -Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`5a7a8a3`](https://github.com/oscal-compass/compliance-trestle/commit/5a7a8a338ad3ef427f2ae9f26e2de4ac920fa525)) +* updated docs -* feat: Initial trestle markdown functionality. (#407) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Initial markdown template for use with cidd - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Update for merge - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: MVP markdown validator working - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: MVP markdown validator working - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Initial full pass of content validation for markdown. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Added missing test files for md workflows. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Correct dependency issues. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Refactored md codebase. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Fixed up unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Adding markdown_validator tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Small updates. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Removing governed projects to reduce scope of PR - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Adding UT's for trestle md subcommands. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Added unit test for allowed_task_name - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: more UT's - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Adding more unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Removing python 3.8+ feature from unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* docs: Adding more documentation. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Updating docs - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Adding windows dependencies - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Added unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* added windows tests for hidden files - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* fix:documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Completed documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Correcting unit tests with bad logic - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: More unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: FrankSuits <frankst@au1.ibm.com> ([`4d58e26`](https://github.com/oscal-compass/compliance-trestle/commit/4d58e265392388c81549967384546ddad8f46e4e)) +* bumped to oscal 1.0.4 and fixed checking of enums via text -* feat: Basics of HTTPS Fetcher for remote caching (#421) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote) HTTPS Fetcher with basic tests. - -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* feat (remote) More tests for HTTPS Fetcher. - -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* feat (remote) More tests for HTTPS Fetcher and some improvements. - -Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> - -* feat (remote) Minor error message fix. - -* feat (remote) Minor error message fix. - -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* feat (remote) Removed outfile use -- was left over from debugging. - -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`cbb43ae`](https://github.com/oscal-compass/compliance-trestle/commit/cbb43ae4876a2015b0f10292c50268160b0a6dfd)) +* updated docs for new oscal version support + +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> + +* merged dev and addressed pr feedback + +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> + +--------- + +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`0dfdc79`](https://github.com/oscal-compass/compliance-trestle/commit/0dfdc797090a5ccbc64b6ba0e2b2dd16464a65ae)) ### Fix -* fix: Issue 344 checked rc for commands in tests and removed dependency on dictdiffer (#440) +* fix: Comply with IBM Github action policy (#1344) -Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`acc337b`](https://github.com/oscal-compass/compliance-trestle/commit/acc337b368602d5191244f973029b6ab02f212b2)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`dd118f8`](https://github.com/oscal-compass/compliance-trestle/commit/dd118f84a26ce0e83cc4249837f91a118ae1f487)) -* fix: Strangely behaving log lines (#425) +* fix: duplicate param_id should be invalid only in profile (#1341) -* fix errant log lines --signoff - -* format fix - -signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`2cca882`](https://github.com/oscal-compass/compliance-trestle/commit/2cca88201e0fcd68419b72d04403a5baf1c1b33d)) +* initial fix -### Unknown +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* Trestle release: Markdown functionality and OSCAL updates prepping for rc2 +* docs -Release to main ([`0d923e1`](https://github.com/oscal-compass/compliance-trestle/commit/0d923e15df8c1fc1936a2efea1d70e9af4750ad0)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* chore:Add google analytics to the trestle website. (#437) +* added extra test for comp def -* chore:Add google analytics to websie. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore:Add google analytics to website. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`eedf171`](https://github.com/oscal-compass/compliance-trestle/commit/eedf17180e0ffef777ed1b1b5b6451ac5661462c)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* chore:Updating mkdocs to avoid errors (#438) +--------- -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`966360f`](https://github.com/oscal-compass/compliance-trestle/commit/966360ffc822882019b551a2dceb9219b6beb5a6)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`0edbd81`](https://github.com/oscal-compass/compliance-trestle/commit/0edbd81efdb164f56d90972aca8bbf7539a6ba57)) -* added uuid regen for import and replicate (#428) +* fix: remove components from ssp during ssp-assemble and give warning (#1327) -* added uuid regen for import and replicate - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> - -* some cleanup and added docs - -Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`805485f`](https://github.com/oscal-compass/compliance-trestle/commit/805485ffafe0ebc6dd08573d347924eccb6debb9)) +* feat: remove compdefs from ssp when no longer valid -* tutorial: what's your compliance posture? (#427) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* tutorial: what's your compliance posture? - -* changed trestle links and fixed typos - -Signed-off-by: Frank Suits <frankst@au1.ibm.com> - -Co-authored-by: FrankSuits <frankst@au1.ibm.com> ([`49c5870`](https://github.com/oscal-compass/compliance-trestle/commit/49c5870dd9a9c3a8cb79c739e3e6d39dfc9b7df7)) +* fix: correcting test case and adding warnings +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -## v0.10.0 (2021-03-25) +* fix: add test case proof for comp-defs removal -### Chore +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* chore: Adjust codecov to allow for some wiggle room. (#414) ([`888696b`](https://github.com/oscal-compass/compliance-trestle/commit/888696bd060b5b10caf35692ff400cbcf2a7de59)) +* fix: change logic for using delete_list_from_list instead of delete_items_from_list -* chore: Typos and remove automation that is causing issues. +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: Updating documentation website content - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Small corrections - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Formatting issues introduced by manual merging in GH - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ec94c22`](https://github.com/oscal-compass/compliance-trestle/commit/ec94c220ed061073e608023d593b6ff7978f0a58)) +* fix: improving warning messages -* chore: Auto-update pre-commit hooks (#390) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`fa040d0`](https://github.com/oscal-compass/compliance-trestle/commit/fa040d0840fa1102ca262e6550301d0485d655ec)) +* fix: changing tests for matching criteria -* chore: Merge back version tags and changelog into develop. ([`be2e49a`](https://github.com/oscal-compass/compliance-trestle/commit/be2e49a5f3733af8d9403f961f88878eba3d86fc)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -### Documentation +* fix: switching to default nist submodules -* docs: Added more tutorials to the documentation for split and merge. +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* 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)) +* fix: defining constant for generic uuid for testing -* docs: Instructions for gen_oscal and fix_any added to website.md (#389) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* updated with description of how to build models with gen_oscal and fix_any - -* Added text for order_classes - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`5053e52`](https://github.com/oscal-compass/compliance-trestle/commit/5053e52e02e6f3761627b358b7e5abe107f17e21)) +* fix: enhance processing and corrrect test cases -### Feature +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* 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 <chris@thebutlers.me> - -* feat:Added exchange protocol support - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`05b8781`](https://github.com/oscal-compass/compliance-trestle/commit/05b8781283a32131ee0fd4a7097edef4bfdb6cb2)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`03d4f05`](https://github.com/oscal-compass/compliance-trestle/commit/03d4f05a1d0bb0ef7c81e768238b67ae5cfbf5ca)) -* feat: added collection utilities. (#413) +* fix: get_control_response was missing prose if statement has no parts (#1335) -* feat: added collection utilities. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Updated documentation to pass build. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: leveraged new capability in load_distributed. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`83c1f17`](https://github.com/oscal-compass/compliance-trestle/commit/83c1f17e8902d969b07d9e3cf9fa1c80c22755c8)) +* initial fix -### Fix +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* fix: Correcting more issues with load_distributed impacting trestle split and merge +* added docs -* 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)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* 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 <chris@thebutlers.me> - -* feat:Added exchange protocol support - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Cleanup for merge. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Added UT's and corrected schema to work with gen_oscal.py - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a194580`](https://github.com/oscal-compass/compliance-trestle/commit/a19458008c5df39dbaf7bbcbfbc4431d16db4831)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`04c39d4`](https://github.com/oscal-compass/compliance-trestle/commit/04c39d4fb2911456c93495dce743cf971dec6f82)) -* fix: merge updates - added version subcommand and modified load_distrib to load files by name (#415) +* fix: better error handling when no comps specified during ssp-assemble - and added docs (#1328) -* 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 <chris@thebutlers.me> ([`0a22c83`](https://github.com/oscal-compass/compliance-trestle/commit/0a22c833671a72f1d204eed50cb881e610ef0595)) +* added test and docs for assem with no comps -* fix: Correct OSCAL output to desired design point for osco-to-oscal. +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* Several small-ish fix-ups to produced OSCAL. - -* Fix comparison data for utils tests. - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`5530eb4`](https://github.com/oscal-compass/compliance-trestle/commit/5530eb4d334251b336a376a6b165b0874f43f391)) +* added docs -* fix: Model behaviour correction and update to latest pydantic version. +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* 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)) +* boosted test -### Unknown +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* Merge pull request #424 from IBM/develop +* fixed test -Release to master ([`1a1fd19`](https://github.com/oscal-compass/compliance-trestle/commit/1a1fd199aeedfac6316f5a994454a4a457941dc6)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* [ImgBot] Optimize images (#411) ([`1bc5860`](https://github.com/oscal-compass/compliance-trestle/commit/1bc58607cb80227bdfc49e77373ce8369562c2b6)) +* debugging test failure -* Doc/tutorial task tanium to oscal (#406) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* Tutorial: use of trestle task tanium-to-oscal - -* transformer-construction - -* title change. - -* put "lite" 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)) +* debug test 2 -* fix:Remove dead workflow +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a730db6`](https://github.com/oscal-compass/compliance-trestle/commit/a730db649079b2dd7a083b33dc84b88939b931d7)) +* final test fix -* fix to problem where split has trouble with files specified with path (#396) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* fix to problem where split has trouble with files specified with directory path - -* boost test coverage - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`e0c1651`](https://github.com/oscal-compass/compliance-trestle/commit/e0c1651340e5700a827d8205bf497476b86b7cf3)) +* improved test -* Feature/tanium plus (#391) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* 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) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`2ecdb98`](https://github.com/oscal-compass/compliance-trestle/commit/2ecdb987f22f3da4592acd636637134161f05a0b)) -* 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 <chris@thebutlers.me> - -* docs: Call out restriction in changes - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`32ae0e8`](https://github.com/oscal-compass/compliance-trestle/commit/32ae0e83b4d49a55316bb715575f83c64fc8e6aa)) +* fix: ssp assemble includes controls not in the profile (#1325) -* Merge branch 'develop' into fix/fix_any_drops_item ([`e400738`](https://github.com/oscal-compass/compliance-trestle/commit/e4007381af3812e07acfd00e66a25ed9beca5f59)) +* fix for extra controls in ssp -* Allow creation of duplicate class names by tagging with index: 1,2,3 etc. ([`d07a398`](https://github.com/oscal-compass/compliance-trestle/commit/d07a398e806bd9e30c09bde4be8f5848705680a9)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge pull request #383 from IBM/feature/samples-oscal-1.0.0-rc1 +* added debug line -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)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge branch 'feature/samples-oscal-1.0.0-rc1' of github.com:IBM/compliance-trestle into feature/samples-oscal-1.0.0-rc1 ([`f070907`](https://github.com/oscal-compass/compliance-trestle/commit/f0709075c157fab7ecf6acefb186084af9fc62ab)) +--------- -* feat (samples-oscal-1.0.0-rc1): Improved behavior of script in Windows environments where /dev/stdout won't work for output. +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`138e95f`](https://github.com/oscal-compass/compliance-trestle/commit/138e95fd0598008b082fdf79a0306f68979c2c8e)) -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`6a02920`](https://github.com/oscal-compass/compliance-trestle/commit/6a029208fadcc419b0d4a1f764689b58029a570d)) +* fix: Version test (#1313) -* fixes from new fix_any ([`80aa9c4`](https://github.com/oscal-compass/compliance-trestle/commit/80aa9c4775159c357889c5c191fb364e4a545c85)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`3c1d7bb`](https://github.com/oscal-compass/compliance-trestle/commit/3c1d7bb439deab94851d2d0eb3b6a6766a0b5601)) -* cleanup for code-lint ([`fd93eb5`](https://github.com/oscal-compass/compliance-trestle/commit/fd93eb528a3f9afdf4bc7611435763b781032d3d)) +### Unknown -* Simplified fix_any and fixed handling of *Item classes ([`b424150`](https://github.com/oscal-compass/compliance-trestle/commit/b424150aa676a58e2255507f2c08088d36e85cb1)) +* Merge pull request #1345 from IBM/develop -* New script to order classes for comparison after applying fix_any ([`8904913`](https://github.com/oscal-compass/compliance-trestle/commit/8904913cc0f8955b2b97b5472482af44434bc123)) +chore: Trestle hotfix release ([`88f0847`](https://github.com/oscal-compass/compliance-trestle/commit/88f08473c05f3b2d5645820afabf8c8fe07dad0b)) -* Min pydantic version now 1.8.1 after recent fix for __root__ ([`6a686d2`](https://github.com/oscal-compass/compliance-trestle/commit/6a686d29dbae0f81e3e6f4c3f04340042cde1123)) +* Merge branch 'main' into develop ([`48026eb`](https://github.com/oscal-compass/compliance-trestle/commit/48026eb2523ce9beeaddbfceec56e262c30b548e)) -* Initial fix to fix_any prior to cleanup ([`9675a3a`](https://github.com/oscal-compass/compliance-trestle/commit/9675a3ac7f9cdfc9e17d955f4ef37d5c8d796461)) +* Merge pull request #1343 from IBM/develop -* new script to sort classes to allow diff after fix_any ([`bec3e3a`](https://github.com/oscal-compass/compliance-trestle/commit/bec3e3a9c96203af6824016cab9b79ef4f2db52b)) +chore: Trestle release ([`d18807c`](https://github.com/oscal-compass/compliance-trestle/commit/d18807c760c4e99f53c4a9feb2360f295413e103)) -* updated version of uuid regen ([`27382ce`](https://github.com/oscal-compass/compliance-trestle/commit/27382ce7f098adc64f731cd19d8920a4e3d491fb)) +## v2.0.0 (2023-03-01) -* Merge branch 'develop' of https://github.com/IBM/compliance-trestle into feat/uuid_regen ([`f90ba17`](https://github.com/oscal-compass/compliance-trestle/commit/f90ba17e0c6d261a3a743cbf571da072aedcde73)) +### Breaking -* Merge branch 'develop' into feature/samples-oscal-1.0.0-rc1 ([`ae4544f`](https://github.com/oscal-compass/compliance-trestle/commit/ae4544ff0e08f8dc5a435f67c6f65fddba900e1c)) +* fix: BREAKING CHANGE (#1311) -* feat (samples-oscal-1.0.0-rc1): Formatted README. +* update docs -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`d3da956`](https://github.com/oscal-compass/compliance-trestle/commit/d3da95655b0a1c3fde66f72f00c9e3d13ed904c7)) +BREAKING CHANGE: Breaking release of Trestle -* feat (samples-oscal-1.0.0-rc1): Clarified README. +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`ec18022`](https://github.com/oscal-compass/compliance-trestle/commit/ec1802208c5d60d58c94099a0ac43d9711d2bb36)) +* update docs again +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -## v0.9.0 (2021-03-02) +--------- + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`cb86284`](https://github.com/oscal-compass/compliance-trestle/commit/cb86284f1d6ee0299dc41d7d0fe66bb61139ce5a)) ### Chore -* chore: Auto-update pre-commit hooks (#379) +* chore: Merge back version tags and changelog into develop. ([`b5d7ab4`](https://github.com/oscal-compass/compliance-trestle/commit/b5d7ab434de140df26bed3636f957e243c8770b0)) -Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`58e766c`](https://github.com/oscal-compass/compliance-trestle/commit/58e766c8fcfea47a12da4e3672cfe394d3efc5db)) +### Documentation -* chore: Merge back version tags and changelog into develop. ([`5475dbe`](https://github.com/oscal-compass/compliance-trestle/commit/5475dbe2502cd649661d7cd14370c161610f7b18)) +* docs: update maintainers.md for missed contributors (#1304) -### Feature +* added ekat alej -* feat: Tanium export to oscal conversion task. +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* 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 <chris@thebutlers.me> ([`5f7bcbf`](https://github.com/oscal-compass/compliance-trestle/commit/5f7bcbf885b5fcb77da054917b6e66fa83ce66e9)) +* fixed typo -### Fix +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* 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 <chris@thebutlers.me> ([`7fc08e1`](https://github.com/oscal-compass/compliance-trestle/commit/7fc08e10b78b658359dc119080d64d44b09a572d)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`5443597`](https://github.com/oscal-compass/compliance-trestle/commit/5443597b0b4cd826b58320e787f47d59f84fe06b)) -### Unknown +* docs: change trestle project references to workspace (#1276) -* Merge pull request #382 from IBM/develop +* docs: change trestle project references to workspace -Bug fix release: clean up issue due to pydantic changes in 1.8.0 ([`48e60ed`](https://github.com/oscal-compass/compliance-trestle/commit/48e60ed1f2f1e0eae71799eec2e49873fd3da0eb)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* feat (samples-oscal-1.0.0-rc1): Sanitized README some more. +* docs: changing workspace for trestle workspace -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`a419961`](https://github.com/oscal-compass/compliance-trestle/commit/a4199616869fc894174f66524a5a112d3252b2b3)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* Fix: Dependency issues including pydantic (#380) +* docs:fix inconsistency in case senstive for trestle workspaces -* Fix: Dependency issues - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix:Constrain pydantic version - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e70a023`](https://github.com/oscal-compass/compliance-trestle/commit/e70a0233e35bec329e2c283998bbc27a20877bc9)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* 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 <jeffetan@au1.ibm.com> ([`de22ac7`](https://github.com/oscal-compass/compliance-trestle/commit/de22ac7c1b32596bd267c8b1f967839d51de1173)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`2f1b4fd`](https://github.com/oscal-compass/compliance-trestle/commit/2f1b4fd79bb67c509ee7f7c4f0d3a14502d0c71f)) -* initial generation of uuids ([`9c8fd13`](https://github.com/oscal-compass/compliance-trestle/commit/9c8fd139665a4042ff3fb115b2e2625ec03534ba)) +* docs: create tutorial for task csv-to-cd (2) (#1257) -* Merge pull request #356 from IBM/feature/remote +* docs: create tutorial for task csv-to-cd -remote cache with SFTP and local fetchers ([`52a49db`](https://github.com/oscal-compass/compliance-trestle/commit/52a49db6df28e6d188b3ec5729d265def2b84128)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Merge branch 'develop' into feature/remote ([`eca4236`](https://github.com/oscal-compass/compliance-trestle/commit/eca4236c5aec2d0cb70ce0c382bb769e74ed1309)) +* docs: create tutorial for task csv-to-cd +Signed-off-by: degenaro <lou.degenaro@gmail.com> -## v0.8.1 (2021-02-24) +* Temporary disable pre-commit autoupdate -### Chore +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* chore: Merge back version tags and changelog into develop. ([`6eb2939`](https://github.com/oscal-compass/compliance-trestle/commit/6eb293999bbbf2052c7a480ffd5a77d7a7304a0f)) +* Revise description: Resource_Instance_Type -### Fix +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* fix: Import issues with hyphen named files (#371) +Signed-off-by: degenaro <lou.degenaro@gmail.com> +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> +Co-authored-by: Ekaterina Nikonova <enikonovad@gmail.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`d31df9f`](https://github.com/oscal-compass/compliance-trestle/commit/d31df9fb3ac4049f4710c2c9655ef8b1d17575e8)) -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)) +### Feature -### Unknown +* feat: cd resolved profile controls check (#1309) -* Merge pull request #374 from IBM/develop +* feat: comp-def resolved profile controls validate (warn) option -Bugfix merge to master ([`ade0c5f`](https://github.com/oscal-compass/compliance-trestle/commit/ade0c5f695c976ecc7169dc4241133fb5c9326b4)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Merge branch 'feature/remote' of github.com:IBM/compliance-trestle into feature/remote -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`b3da0f1`](https://github.com/oscal-compass/compliance-trestle/commit/b3da0f1ab03664419ae3cd8fd250e5170eed00ef)) +* Use cwd as trestle workspace. -* 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 <jeffetan@au1.ibm.com> ([`74223a1`](https://github.com/oscal-compass/compliance-trestle/commit/74223a18a7e4d81a55167d0237d0fb1f14d9385d)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Merge branch 'develop' into feature/remote ([`99967cc`](https://github.com/oscal-compass/compliance-trestle/commit/99967cc13e3dec608fb9af0426075f3b09ebb929)) +* validate-controls can be on, warn, off (default) -* Fix: Corrected componnent model caused by new datamodel-gen, using original nist source (#373) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b18a815`](https://github.com/oscal-compass/compliance-trestle/commit/b18a8150846d0019753cbe536e8532eec0c0cccc)) +* Control_id_List cell should be stripped. -* feat:Improved documentation abstraction to use the doc string at multiple levels. (#370) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a5510aa`](https://github.com/oscal-compass/compliance-trestle/commit/a5510aa786d4de26dfd2991f902ee420faae6e86)) +* Spelling. -* Merge branch 'develop' into feature/remote ([`20c793e`](https://github.com/oscal-compass/compliance-trestle/commit/20c793e8cf93c5624d249eaac17c53c3153ddc73)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* feat (remote): Linted. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`23dc762`](https://github.com/oscal-compass/compliance-trestle/commit/23dc76213d376ee9295d9e0d0bed94c64887a283)) +* 100% test coverage. -* 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 <jeffetan@au1.ibm.com> ([`b9c4778`](https://github.com/oscal-compass/compliance-trestle/commit/b9c47781b7b8c8fcd49d64cbb3a6a2a678be9119)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> +* Use CatalogInterface to get list of control from catalog. -## v0.8.0 (2021-02-22) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -### Chore +* Add row descriptions to task info. -* chore: Auto-update pre-commit hooks (#362) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -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) +Signed-off-by: degenaro <lou.degenaro@gmail.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`638dd53`](https://github.com/oscal-compass/compliance-trestle/commit/638dd5384c6588ad9bb88726c8d716cfc6e4b03b)) -* unit test: website boots and is usable. - -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -* whoopsi - forgot to format & lint. - -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -Co-authored-by: degenaro <degenaro@us.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`7b1b48d`](https://github.com/oscal-compass/compliance-trestle/commit/7b1b48d8438c0f2f800741945811fb832ad76df0)) +* feat: Add ability to view version of the individual OSCAL object (#1298) -* chore: Merge back version tags and changelog into develop. ([`4686dd4`](https://github.com/oscal-compass/compliance-trestle/commit/4686dd46d14e9d9c57431c238a8bed2e4a816acc)) +* feat: Add ability to view version of the object -### Documentation +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* docs: website documentation for trestle task osco-to-oscal (#336) +* feat: Add docs and more tests -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -Co-authored-by: degenaro <degenaro@us.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`95c5c09`](https://github.com/oscal-compass/compliance-trestle/commit/95c5c09b9f6f56aa4697609459f1369e06b7f3c2)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -### Feature +* feat: Address review feedback -* feat: Added bulk operations for assemble (#367) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Allows assemble to be executed across all files of a given type. -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`771d54e`](https://github.com/oscal-compass/compliance-trestle/commit/771d54e29ee839d38330929001c908b6ad669f8f)) +* feat: Fix docs -* feat: Utility to transform OSCO yaml data into OSCAL observations json data. (#348) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -Co-authored-by: degenaro <degenaro@us.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`488a75a`](https://github.com/oscal-compass/compliance-trestle/commit/488a75a7fa5f259b2655b624ba7e3643c4ab7b28)) +* feat: Address review comments -* feat: validate duplicates now loads distributed models (#346) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`1d54353`](https://github.com/oscal-compass/compliance-trestle/commit/1d54353e595a502a3f1d0f4410f9da38f501daaa)) +--------- -### Fix +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`cf2af61`](https://github.com/oscal-compass/compliance-trestle/commit/cf2af617fad82ccdfbebcd48948dd8a67512e7aa)) -* fix: Allow assemble to succeed when no model is found. (#368) +* feat: new format csv to oscal component definition (#1285) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`fe7a288`](https://github.com/oscal-compass/compliance-trestle/commit/fe7a2882f447a628a30a08d1c089fac752d16579)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`9572c4b`](https://github.com/oscal-compass/compliance-trestle/commit/9572c4b83c03eaec6518333670fa8d6c80cafbf2)) -* fix: To website automation test on windows (#366) ([`8e3ecbf`](https://github.com/oscal-compass/compliance-trestle/commit/8e3ecbf5f9acb8db4e200f7769cefcb20941a410)) +* feat: allow remote profiles to reference catalogs and profiles by relative path in href (#1288) -### Unknown +* import now handles local relative hrefs -* Merge pull request #364 from IBM/develop +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Release to main: Refactored behaviour for validate and assemble. ([`194c005`](https://github.com/oscal-compass/compliance-trestle/commit/194c0058d2d2e806ea19cefddde8a05ea9c5bfe2)) +* updated docs -* feat (remote): Updated test_https_fetcher() so a try block isn't included. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`54019af`](https://github.com/oscal-compass/compliance-trestle/commit/54019af446c3942897c142913176a6775248dbe1)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* 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 <jeffetan@au1.ibm.com> ([`663af76`](https://github.com/oscal-compass/compliance-trestle/commit/663af764627d36bc3c33f14186d25aafa980ea54)) +* addressed pr changes -* Merge branch 'feature/remote' of github.com:IBM/compliance-trestle into feature/remote -Chris merged develop into this more recently. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`90437e4`](https://github.com/oscal-compass/compliance-trestle/commit/90437e4b18ed59c8374cc331bd41a08f8f24d07a)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* 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 <jeffetan@au1.ibm.com> ([`7cd95ca`](https://github.com/oscal-compass/compliance-trestle/commit/7cd95ca59b2a193d1651f777cfa2eb3d0dadd71c)) +--------- -* Merge branch 'develop' into feature/remote ([`2db970f`](https://github.com/oscal-compass/compliance-trestle/commit/2db970fc4afdfdffb8fcbeb1f38ad68b7044dc30)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`0a7e2cf`](https://github.com/oscal-compass/compliance-trestle/commit/0a7e2cf47680c19ef406aeb49afc35412478fc57)) -* feat (remote): Setting relative paths for the local fetcher aside, for now. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`d5c6285`](https://github.com/oscal-compass/compliance-trestle/commit/d5c628509e871cf7b962b6ca36c497233fa1ec32)) +* feat: CIS spread sheet to OSCAL catalog (#1270) -* feat (remote): Can't handle relative paths properly on Windows just yet. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`d1632a7`](https://github.com/oscal-compass/compliance-trestle/commit/d1632a7636a8ab24d0303dfb2f5aa84077875c9e)) +* Initial delivery. -* feat (remote): code-format prefers one line. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`cb806bb`](https://github.com/oscal-compass/compliance-trestle/commit/cb806bb0fbacb174adc1399d89c6771c744c70ab)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* feat (remote): Allowing for sftp uri with a password but no username, which is pulled in from environment instead. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`b7f3630`](https://github.com/oscal-compass/compliance-trestle/commit/b7f3630800a6164f9d5e151cd6ff4a992544d493)) +* Add tests. -* feat (remote): Fixed unwanted attribute assignments (may remove them completely). Added local fetcher test for relative paths. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`0dbf1a5`](https://github.com/oscal-compass/compliance-trestle/commit/0dbf1a55ceb278ea497b9978276137fe1060f78e)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* feat (remote): Fixed naming for _cached_dir variable to disambiguate across fetchers. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`2292f7b`](https://github.com/oscal-compass/compliance-trestle/commit/2292f7b8cd79295dd6f8976af6982c7c47c6f2ad)) +* Remove duplicate lines? -* feat (remote): Improved docstrings, with attributes and arguments listed where applicable. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`c779099`](https://github.com/oscal-compass/compliance-trestle/commit/c7790990cb9fe661456808d1c4789d4a4522b0d6)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Wrap validate in try block to catch exceptions. Increase test coverage. (#363) ([`14686a8`](https://github.com/oscal-compass/compliance-trestle/commit/14686a873b71aff2ba6a4494efed49d8f95ec29d)) +* Sonar. -* feat (remote): Improved docstrings, cleaned up code a bit. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`a96a0c6`](https://github.com/oscal-compass/compliance-trestle/commit/a96a0c6af225b152ec28c54b6c451b70de8d0988)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Feature/validate distributed now validates models by type and all (#360) +* Combined Profiles sheet, only. -* 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 <chris@thebutlers.me> ([`b347222`](https://github.com/oscal-compass/compliance-trestle/commit/b347222314282d520bdcb60f1de325429fd5d5e7)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* feat (remote): Accepting any Windows filesystem drive letter in uri. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`12b4d11`](https://github.com/oscal-compass/compliance-trestle/commit/12b4d11021c3ff43e7d66c7637e976331b32320e)) +* Refine functionality + tests for 100% coverage. -* feat (remote): Added or improved docstrings, and removed unnecessary fail_hard attribute. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`68d384f`](https://github.com/oscal-compass/compliance-trestle/commit/68d384f881ab0133220f67f5dcad0bd5283f7e61)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* feat (remote): Moving settings work out of this branch. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`178cc4b`](https://github.com/oscal-compass/compliance-trestle/commit/178cc4b7e8dabea1941561f68c1208158385faac)) +* Remove use of deprecated methods. -* feat (settings): Moving settings-related work out of this branch and into its own branch. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`b3de78c`](https://github.com/oscal-compass/compliance-trestle/commit/b3de78c896316bb04ff06ab64281a8a4cc05e196)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* feat (settings): Using random non-functional token string. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`e72ea65`](https://github.com/oscal-compass/compliance-trestle/commit/e72ea6576b431a0351984514eae159714dd81154)) +* Support RHEL spread sheet. -* feat (remote): Again, username and password for HTTPSFetcher tests instead of expecting a particular env var. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`c7390c1`](https://github.com/oscal-compass/compliance-trestle/commit/c7390c1b5138b6707627346c18b32ba3c3ed3a66)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* feat (remote): Setting username and password for HTTPSFetcher tests instead of expecting a particular env var. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`38d4a87`](https://github.com/oscal-compass/compliance-trestle/commit/38d4a8746a63eaeba3014282edbf542695fb3611)) +* Include namespace for props. -* feat (remote): linted HTTPSFetcher tests. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`664da29`](https://github.com/oscal-compass/compliance-trestle/commit/664da29e91f38a7e9ae9a41888f4f4c1399d4758)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* feat (remote): improved get test for HTTPSFetcher. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`e4aec2c`](https://github.com/oscal-compass/compliance-trestle/commit/e4aec2cd848e5db39b7509ac70727cfac9c1fb34)) +* Fix comment. -* feat (remote): get failure test for HTTPSFetcher. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`620fe44`](https://github.com/oscal-compass/compliance-trestle/commit/620fe442685a8dee0bac53bccb5d578130e90ea9)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* 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 <jeffetan@au1.ibm.com> ([`d3d96e6`](https://github.com/oscal-compass/compliance-trestle/commit/d3d96e6c6d43bde4de1b7d1d4b5b69d9445b317d)) +* mkdocs -* Feat: Trestle init now adds keep files. (#357) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* trestle init now adds .keep files to preserve directory structure for git - -Signed-off-by: Juliet Rubinstein <juliet.rubinstein@ibm.com> - -* trestle init now adds .keep files to preserve directory structure for git - -Signed-off-by: Juliet Rubinstein <juliet.rubinstein@ibm.com> - -* trestle init now adds .keep files to preserve directory structure for git - -Signed-off-by: Juliet Rubinstein <juliet.rubinstein@ibm.com> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`f6ca64a`](https://github.com/oscal-compass/compliance-trestle/commit/f6ca64adf99eca5a89d678266b377d07eb3d3ce3)) +* description -> statement -* Added tests for unsupported scheme in url and a local file in a Windows filesystem. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`c8f8de7`](https://github.com/oscal-compass/compliance-trestle/commit/c8f8de79ceeb729511ca830fc60b7911de3128b4)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Merge pull request #354 from IBM/feature/import-validate +* Fix part-id. -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)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* feat (import): Updated nist submodules. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`05db1a0`](https://github.com/oscal-compass/compliance-trestle/commit/05db1a08bbc6143a2f66145978d5da13270cfa37)) +* Fix (rhel) multiple controls -> multiple profile props -* feat (import): Linted/formatted/modified to allow make test to succeed. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`f51023f`](https://github.com/oscal-compass/compliance-trestle/commit/f51023f078b993331c59ad561533e8211d8115ac)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Merge branch 'develop' into feature/remote -Just to align this branch with recent updates in develop. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`f5e5723`](https://github.com/oscal-compass/compliance-trestle/commit/f5e57238fe48c7c63e57ce9116c02b98012f5cf1)) +* More precise test case names. -* feat (import): Updated test for import with validation calls, coverage up to 100%. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`c168922`](https://github.com/oscal-compass/compliance-trestle/commit/c1689223330d28c9487cde5337ea1a3a18e9883e)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Merge branch 'develop' into feature/import-validate -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`c41df46`](https://github.com/oscal-compass/compliance-trestle/commit/c41df46508ccc5d7d8ee8d19630c6279e1beba35)) +* Fix duplicate part ids. -* feat (import): Updated tests for import with validation calls. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`2a3b71f`](https://github.com/oscal-compass/compliance-trestle/commit/2a3b71f290077bef6e1247c8d29ec5d5eb78a7eb)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* feat (import): Linted. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`2ea9df6`](https://github.com/oscal-compass/compliance-trestle/commit/2ea9df6a70daca840fa9bbfae262acb277175b59)) +* Use BackMatter for links. -* feat (import): Validating imported model using trestle validate, rolling back if unhappy with results. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`d9c810a`](https://github.com/oscal-compass/compliance-trestle/commit/d9c810ad09e7c33baf3f424b5ea9fb38e2483d21)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* New command replicate and functionality to deduce content type based on discovered file extension (#331) +* factor out duplicate LOCs. -* 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 <chris@thebutlers.me> ([`2694101`](https://github.com/oscal-compass/compliance-trestle/commit/2694101f4414446d5b1fae8b4218083379d7d2ea)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> +* Replace "if len(my_array)" construct with "if my_array". -## v0.7.2 (2021-02-02) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -### Fix +* Remove title from Resources in BackMatter for Links. -* fix: DevOps fixes onto main (#334) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Implemented trestle assemble with some UT - -* Modified docs - -* Code format - -* Code lint - -* Extending UT - -* Full UT - -* assemble bug fix - -* fix 'make docs-serve' on linux (Red Hat 7.9) - -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -* Updated to deal with inherently plural model names. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Fix merge main to back to develop automatically.(#332) - -* Corrected errors in the build process. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Corrected errors in the build process. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Nebula Alam <anebula@au1.ibm.com> -Co-authored-by: degenaro <degenaro@us.ibm.com> ([`74df375`](https://github.com/oscal-compass/compliance-trestle/commit/74df375c15ad0bc2f0fb8c54e1ed83faf11d66e4)) +* Remove first in property list detection: unnecessary. -* fix: Fix merge main to back to develop automatically.(#332) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Corrected errors in the build process. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Corrected errors in the build process. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`b64dd9f`](https://github.com/oscal-compass/compliance-trestle/commit/b64dd9f5d1183109fe18bd3a75f5953af269d985)) +--------- -### Unknown +Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`ba9dec0`](https://github.com/oscal-compass/compliance-trestle/commit/ba9dec0f4799b68160bd0e2aee66423763df21a6)) -* Merge branch 'main' into develop ([`59b9945`](https://github.com/oscal-compass/compliance-trestle/commit/59b994536fa7ffe78498bfa4b17bf0d4943c970a)) +* feat: csv to oscal cd reconcile3 (#1272) +* feat: csv to oscal cd reconcile3 -## v0.7.1 (2021-02-02) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -### Fix +* Major test cases changes. -* fix: Assembly behaviour correction and devops fixes. +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Implemented trestle assemble with some UT - -* Modified docs - -* Code format - -* Code lint - -* Extending UT - -* Full UT - -* assemble bug fix - -* fix 'make docs-serve' on linux (Red Hat 7.9) - -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -* Updated to deal with inherently plural model names. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Nebula Alam <anebula@au1.ibm.com> -Co-authored-by: degenaro <degenaro@us.ibm.com> ([`ac3828d`](https://github.com/oscal-compass/compliance-trestle/commit/ac3828de66874807b70ee372be51976a724322d1)) +* Reduce code duplication in tests. -* fix: Corrected assemble to push files into the correct location. ([`f3bc0e5`](https://github.com/oscal-compass/compliance-trestle/commit/f3bc0e5df22430d396ca0d82bc70624db34a6986)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -### Unknown +* Remove extraneous test data file. -* Merge branch 'main' into develop ([`31e0ac5`](https://github.com/oscal-compass/compliance-trestle/commit/31e0ac5c1ae956140b38d2a7f1b1961a93dd707c)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Merge branch 'develop' into feat/assemble ([`44d884e`](https://github.com/oscal-compass/compliance-trestle/commit/44d884e0fd9ddd4e207f54dde3ae684c80d4eb96)) +--------- -* Updated to deal with inherently plural model names. +Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`a19e7be`](https://github.com/oscal-compass/compliance-trestle/commit/a19e7be1ce8b8fb267bfd797ddcad742fdf4fcfd)) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`3404043`](https://github.com/oscal-compass/compliance-trestle/commit/34040437cd9b26361934ad24e89926264bb137c6)) +* feat: SSP cli changes to load comp defs (#1264) -* feat (remote): testing local fetcher get_oscal() and get_raw(), and code format/lint fixes. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`05a1e04`](https://github.com/oscal-compass/compliance-trestle/commit/05a1e04c8afabda3e266d1fa97e02060b94b5db8)) +* added profile href -* feat (remote): updated get_oscal() and get_raw() to adjust to proper treatment of _inst_cache_path as full paths to the cache object -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`df886e0`](https://github.com/oscal-compass/compliance-trestle/commit/df886e04a3c2dfbf8f530bfe075ecab155db1148)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote): local and sftp fetchers now treat _inst_cache_path as full paths to the cache object, rather than the containing directory. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`c43292e`](https://github.com/oscal-compass/compliance-trestle/commit/c43292ee879cfe4f29fe45cd2d7f9cd23fa7559d)) +* hooked profile title into all commands -* feat (remote): merge resolution: sftp tests. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`e2a387d`](https://github.com/oscal-compass/compliance-trestle/commit/e2a387df314a729058562e96bc5dca181ce3adb7)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote): linting and improving test code. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`bef5013`](https://github.com/oscal-compass/compliance-trestle/commit/bef50133da6c306934ef8c1b8cfb5158ae2e1448)) +* use compdef info -* feat (remote): merging get_oscal and tests in. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`de5bf83`](https://github.com/oscal-compass/compliance-trestle/commit/de5bf83c02f415ad06777993399121119d22ed83)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote): cleaned up commented region. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`a73bed1`](https://github.com/oscal-compass/compliance-trestle/commit/a73bed1806db0d85487ce10b5df946077a243396)) +* fixed rewrite behavior of ssp assemble -* fix:Correct casing in mkdocs serve to work on case sensitive file sytems. +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -fix 'make docs-serve' on linux (Red Hat 7.9) ([`a2949e1`](https://github.com/oscal-compass/compliance-trestle/commit/a2949e15b79bfc8ee13dd9822aa49e708548c62d)) +* fixed dropped control imps during ssp assemble -* fix 'make docs-serve' on linux (Red Hat 7.9) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> ([`28e5fc0`](https://github.com/oscal-compass/compliance-trestle/commit/28e5fc048bafdec4d42d6e2d838df41f83179189)) +* this system uuid now used -* Merge develop ([`d0b2d26`](https://github.com/oscal-compass/compliance-trestle/commit/d0b2d26c0fd81d13e904b95e162e1279747ad517)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* assemble bug fix ([`fcbbfd2`](https://github.com/oscal-compass/compliance-trestle/commit/fcbbfd2127c9bab2ac07fafd4b8ff4a9fe85e804)) +* improved set param handling -* feat (remote): cleaned up: get_oscal() doesn't need JSONDecodeError. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`b84a5d1`](https://github.com/oscal-compass/compliance-trestle/commit/b84a5d17275ed8654c043a4a303a3017712cd063)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote): get_oscal() implemented and tested, with limited linting. However, yapf did include other parts beyond get_oscal() code for both cache.py and cache_test.py -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`d71607c`](https://github.com/oscal-compass/compliance-trestle/commit/d71607c447d181a74600b84cea1ac1fff1d125eb)) +* values are now always list +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -## v0.7.0 (2021-01-28) +* added props to comp_info -### Chore +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* chore: Updated bad documentation. (#317) +* fixed duplicate line -* Corrected bad link for website homepage. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Typo corrections in documentation website - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`b5a58f7`](https://github.com/oscal-compass/compliance-trestle/commit/b5a58f71ba1bd7f6a89bb5626999ab8ee6a0049a)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* chore: Auto-update pre-commit hooks (#312) +* pull direct from compdefs into ssp -Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> ([`0c6c748`](https://github.com/oscal-compass/compliance-trestle/commit/0c6c7487aa26e6666511ec159e35e41e7052db95)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -### Documentation +* insert content into ssp -* docs: Fix typos and grammar in cli and misspelling in split_merge docs (#306) ([`272c2cc`](https://github.com/oscal-compass/compliance-trestle/commit/272c2ccf6fbfca5fe6cdac7f0623b85fa8d5ddd7)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -### Feature +* add bycomp at control level and require rules -* feat: trestle assemble implemented and documented. +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Implemented trestle assemble with some UT - -* Modified docs - -* Code format - -* Code lint - -* Extending UT - -* Full UT - -Co-authored-by: Nebula Alam <anebula@au1.ibm.com> ([`e752bc2`](https://github.com/oscal-compass/compliance-trestle/commit/e752bc2a6923c05c6251622499137d0c40633467)) +* added rules check -* feat: Enhancement to handle arboretum fetcher-built OSCO evidence as input (#311) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -Co-authored-by: degenaro <degenaro@us.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`e9c4196`](https://github.com/oscal-compass/compliance-trestle/commit/e9c41969597c6bf587b5732e0851da3e7b24429e)) +* added imp status -* feat: task osco-to-oscal to allow transformation from OpenSHift Compliance Operator to OSCAL (#296) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* task osco-to-oscal - -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -* Fixes to address review by Chris Butler. - -- move AssessmentResultsPartial class into osco.py -- fix wacky typing -- fix function/class variable annotations -- fix OSCAL object initialization -- fix awkward while true construct -- use tmp_path -- remove extraneous import - -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -* Fixes to address PR comments from CB. - -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -* Remedy the metadata cluster-X info concern. - -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -* output file reduced to observations list only & improved test cases. - -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -* oops, missed a return type. - -Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> - -Co-authored-by: degenaro <degenaro@us.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`ad995a2`](https://github.com/oscal-compass/compliance-trestle/commit/ad995a22029aa67972bc9e6fdd3ebd0e987f50ba)) +* tests pass with some things turned off -* feat: Merge allows use of both yaml and json files. +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Co-authored-by: Nebula Alam <anebula@au1.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`4d87e6a`](https://github.com/oscal-compass/compliance-trestle/commit/4d87e6aac5a49d1624da06d4f7bab4accb13b033)) +* changed operational to planned -### Fix +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* fix: Corrected bad link to website homepage. (#314) +* fixed empty list -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`81124fb`](https://github.com/oscal-compass/compliance-trestle/commit/81124fba5f25772cbcabf3fd0923ac6284794ff1)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -### Unknown +* improved merging into ssp -* Release of trestle of assembly and osco-to-oscal. +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -feat: Release of assembly, osco-to-oscal and other tasks ([`a56c546`](https://github.com/oscal-compass/compliance-trestle/commit/a56c54683ca8ac938f1fc2af787db34f852a9a44)) +* assemble is now repeatable -* Merge branch 'main' into develop ([`0a4e9c7`](https://github.com/oscal-compass/compliance-trestle/commit/0a4e9c7577576597fa70e1e21abe5d579f155387)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Full UT ([`f90c351`](https://github.com/oscal-compass/compliance-trestle/commit/f90c3512f466c9ea3cd5cca6290c1b6f288046c0)) +* ssp assemble now does not write if no change -* Merge branch 'develop' into feat/assemble ([`963e9b9`](https://github.com/oscal-compass/compliance-trestle/commit/963e9b967d87404cedca959f5f05eeae260fc567)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Extending UT ([`3662b83`](https://github.com/oscal-compass/compliance-trestle/commit/3662b83a660eed4c1f14eb864afd20b04633be19)) +* added more help comments to the md yaml header -* feat (remote): Removed unused import. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`6f3a2c7`](https://github.com/oscal-compass/compliance-trestle/commit/6f3a2c72a9e0cf868a9fd4175252c957d8d2054f)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote): Implemented base class get_raw() method with on unit tests using local fetcher. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`7abf6a7`](https://github.com/oscal-compass/compliance-trestle/commit/7abf6a7c2a947d8b4043002655bdfdef5e6b87db)) +* boost coverage and cleanup -* Code lint ([`d0c8e84`](https://github.com/oscal-compass/compliance-trestle/commit/d0c8e847dd4a13cc7993e86fe567d43a021db6a6)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Code format ([`9a9235f`](https://github.com/oscal-compass/compliance-trestle/commit/9a9235ff62735bd300ad41b9c24945517d276cd0)) +* refactored smell -* Modified docs ([`ff49c03`](https://github.com/oscal-compass/compliance-trestle/commit/ff49c03a762abd1ea2fc54d69e2a93e576e07318)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge branch 'develop' into feat/assemble ([`71b0497`](https://github.com/oscal-compass/compliance-trestle/commit/71b04976a7b35403a61e750ff4ea5c30995d9934)) +* add set_param -* Implemented trestle assemble with some UT ([`cc02d70`](https://github.com/oscal-compass/compliance-trestle/commit/cc02d70febe86e6b1579f40c323a92637b3b1a8d)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote): Fixed some unit tests, and linted. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`83de1bc`](https://github.com/oscal-compass/compliance-trestle/commit/83de1bcd57e279e540452802f84eb28da5d1da0d)) +* updated docs and map setparams to rules -* feat (remote): More sftp fetcher unit tests. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`0b3ede0`](https://github.com/oscal-compass/compliance-trestle/commit/0b3ede0bd0e7e0d8cc233433aa9d70dc7e691155)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote): Removed unnecessary mkdir success check for subdirectory inside _trestle_cache_path, which would have been created successfully previously via __init__. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`8f5f66b`](https://github.com/oscal-compass/compliance-trestle/commit/8f5f66b4e35c58f2d69a8de5c524b110278816be)) +* fixed dropped setparams -* feature (remote): Fixed settings.py being inside main_test.py... ([`3dfe3b9`](https://github.com/oscal-compass/compliance-trestle/commit/3dfe3b91c049c9c69daede44b4a7fec1c398a458)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feature (remote): merged remote-sftp branch and resolved... ([`c193dce`](https://github.com/oscal-compass/compliance-trestle/commit/c193dce90ecbfe2bdfbd608ff931a6728b691142)) +* addressed pr change requests -* Merge pull request #308 from IBM/feature/remote-sftp +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Feature/remote-sftp looks good to reviewer. ([`be497fc`](https://github.com/oscal-compass/compliance-trestle/commit/be497fcda82dc8a14c1dea39e6157eb215d4af3b)) +* fixed empty set params and rules at top level of imp req -* feat (remote): for sftp fetcher, linting and format fixed. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`37b3543`](https://github.com/oscal-compass/compliance-trestle/commit/37b3543c7f462229566825442128c3d4b21a8ae2)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feature (remote): misc tweaks resulting from merge... ([`98856b9`](https://github.com/oscal-compass/compliance-trestle/commit/98856b93e9b6f819dda23a8b7976fb06eecf491d)) +* flake8 ignore B017,B028 -* feature/remote: various updates to fetchers... ([`ff1596c`](https://github.com/oscal-compass/compliance-trestle/commit/ff1596cbdd3a2ed2c15a6c2c3723f2256331d7ac)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merged cache_test... ([`f94f0bd`](https://github.com/oscal-compass/compliance-trestle/commit/f94f0bda54065200f022994bda86b8da0d4c68d8)) +* fixed docs and added error msg to ssp-filter -* Progress with GithubFetcher and HTTPSFetcher... ([`f03284e`](https://github.com/oscal-compass/compliance-trestle/commit/f03284e6b1e44a7634a249e9637f1b0ecb85c21b)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote): for sftp fetcher, added loading of ssh key file via env var SSH_KEY, and updated testing. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`b1907c0`](https://github.com/oscal-compass/compliance-trestle/commit/b1907c078137e2106d87bde330f7b473a229b49b)) +* fixed comment for rule param values +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -## v0.6.2 (2021-01-17) +* better handling of rule param value -### Fix +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* fix: Corrected branch for mkdocs deploy. (#304) (#305) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`2835eed`](https://github.com/oscal-compass/compliance-trestle/commit/2835eed4bf700ca0f90120063a707fb811f610fb)) -Note: Alternative techniques may be required, however, with devops integration it must be tested live. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`be3f13a`](https://github.com/oscal-compass/compliance-trestle/commit/be3f13a89d44c3f773ad7e372e4116eb609c8f5d)) +* feat: ssp based on components and refactor (#1261) -* fix: Corrected branch for mkdocs deploy. (#304) +* initial ssp based on comps -Note: Alternative techniques may be required, however, with devops integration it must be tested live. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`2dd5d93`](https://github.com/oscal-compass/compliance-trestle/commit/2dd5d93df759f9bde345ca1f8d59014d8eb15787)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -### Unknown +* cleaned up for push -* Merge branch 'main' into develop ([`0411969`](https://github.com/oscal-compass/compliance-trestle/commit/04119696cf646b15b3aed0933eaae95923f3af0e)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> +* ssp mostly working -## v0.6.1 (2021-01-15) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -### Chore +* chore: Initial split -* chore: Updated UTs more 100% coverage (#302) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e77fda3`](https://github.com/oscal-compass/compliance-trestle/commit/e77fda329924230f70a18b34b63011d882ed6297)) +* merged with refactor branch and added ssp test data -* chore: Make fix_any deterministic in output generation (#300) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -also added full coverage for snake and camel tests ([`c66292e`](https://github.com/oscal-compass/compliance-trestle/commit/c66292ece62dde1aa3df5857b890d543ee99add1)) +* now generate ssp output -* chore: Auto-update pre-commit hooks (#299) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> ([`cf83024`](https://github.com/oscal-compass/compliance-trestle/commit/cf83024629b3588891273c5bdcee57d47b2e9a7c)) +* Split profile as markdown to parts, rename yaml_header -* chore: Ensure develop is correctly updated after a release. (#294) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* chore: Ensure develop is updated after release is completed. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Corrected typos in PR template. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`72539c9`](https://github.com/oscal-compass/compliance-trestle/commit/72539c956be59422056bdb82143772587a9f5f05)) +* fixed yaml header issue -* chore: Add mdformat-gfm to setup.cfg (#292) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Taneli Hukkinen <hukkinj1@users.noreply.github.com> ([`4750882`](https://github.com/oscal-compass/compliance-trestle/commit/4750882396ea44dbfdebe8860cc527a7768a7ac6)) +* Small change to component -### Documentation +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* docs: Initial setup of documentation website. (#234) +* more content in ssp header -* Documentation website builds. Needs significantly more content. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Fixes missing deploy script - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* More updates to the documentation website. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated contributing documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Pre-merge commit - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Precommit update test. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated documentation for basemodel - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added missing docs files - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Fixing mdformatting issues with include - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added more api docs pages - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Fix gitignore to cover html coverage website. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Fix gitignore to cover html coverage website. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updates - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Corrected poorly formatted links. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Improvements in documentation build process. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Basic documentation website setup complete. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* docs/cli.md - -Co-authored-by: Nebula Alam <anebula@au1.ibm.com> ([`a51081b`](https://github.com/oscal-compass/compliance-trestle/commit/a51081bd93cb43b02135b72f00e16cf805eacba9)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -### Fix +* A small fix in the header merge -* fix: Extra unit tests and cleanup to close more significant gaps (#298) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`2abcaad`](https://github.com/oscal-compass/compliance-trestle/commit/2abcaadc1bc14419111e1778bbb1fab61d633d5e)) +* more header content -* fix: Changed split to not write empty files after split. Implemented circular split-merge test (#295) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Co-authored-by: Nebula Alam <anebula@au1.ibm.com> ([`1ebbeb2`](https://github.com/oscal-compass/compliance-trestle/commit/1ebbeb20db1e25852dd58f7fa7a4ed909e995ef0)) +* cleaned up ssp header -### Unknown +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Documentation website up and running. (#297) +* improved comp gen -Minor release: Documentation website up and running. ([`1f8b364`](https://github.com/oscal-compass/compliance-trestle/commit/1f8b364f534131678e74c05538d7db79efe5aabe)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge branch 'main' into develop ([`b984828`](https://github.com/oscal-compass/compliance-trestle/commit/b98482828d085c0ba796522b27a75c9162f86871)) +* ssp gen and assemble mostly working -* feat (remote): added more unit testing for sftp fetcher -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`e0351e4`](https://github.com/oscal-compass/compliance-trestle/commit/e0351e4bb79aa929312e29644f08c7c70864513e)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote): added unit tests for sftp fetcher -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`19ef19b`](https://github.com/oscal-compass/compliance-trestle/commit/19ef19bcb8338650344729a350744e5ad508370c)) +* initial ssp-values working -* feat (remote): working sftp fetcher, live tested with active ssh-agent and password-less auth -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`cd0725d`](https://github.com/oscal-compass/compliance-trestle/commit/cd0725d0363e0ba9a8f3832cf03268c6d3c06c7c)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote): added more validations for sftp fetcher, and one for https, with adjustments to unit testing -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`d0e8304`](https://github.com/oscal-compass/compliance-trestle/commit/d0e830422446e49b6379cabf31d595cc5cc595fd)) +* fixed test data for jinja and ssp outputs all controls -* feat (remote): started sftp fetcher with simple validation and test, initializing cache location, but no actual fetching yet. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`0a75bcb`](https://github.com/oscal-compass/compliance-trestle/commit/0a75bcb8f39da55d137acc5fc616651a5718418c)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge pull request #281 from IBM/feature/remote-local +* Make jinja tests happy -LocalFetcher can now refresh cache from file:/// or absolute path source. ([`c049fa5`](https://github.com/oscal-compass/compliance-trestle/commit/c049fa5e3b41a74b333ac652232a3562fd68faa9)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* feat (remote): generic handling of paths that should also work on Windows environments, linted. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`a1d8e8f`](https://github.com/oscal-compass/compliance-trestle/commit/a1d8e8f9e626677606a335c1c68974615f6cc74f)) +* better handling ssp vals -* feat (remote): generic handling of paths that should also work on Windows environments. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`80f2b8d`](https://github.com/oscal-compass/compliance-trestle/commit/80f2b8d50f72e3ed6e1fee3d2b45719a5448c269)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +* better handling of ssp rules and params -## v0.6.0 (2021-01-07) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -### Chore +* Change doc strings -* chore: Auto-update pre-commit hooks (#277) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> ([`2a2d394`](https://github.com/oscal-compass/compliance-trestle/commit/2a2d39432cd6c32c0373465eee0f84893a7f0718)) +* fixed comp gen test -* chore: Autoformat GFM tables with mdformat-gfm (#268) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Taneli Hukkinen <hukkinj1@users.noreply.github.com> ([`fe4d907`](https://github.com/oscal-compass/compliance-trestle/commit/fe4d9077318fd46aab8088ad1405b6d22bb573b6)) +* prompts are now comments -* chore: Remove references to master branch and run releases off of "main" (#259) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Remove references to master branch and run releases off of "main" - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Corrected broken github header. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`c81b4ba`](https://github.com/oscal-compass/compliance-trestle/commit/c81b4ba116726189d0ced5b2a52f470afe94d29e)) +* bracked around ssp params in prose -### Feature +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat: Force update of version +* all tests pass -Version failed due to migration to 'main' branch. ([`fc0357b`](https://github.com/oscal-compass/compliance-trestle/commit/fc0357b297bb59d64ad28af23fe2404c31364010)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat: Update to OSCAL 1.0.0rc1 and simplified models. (#286) +* updated docs -* 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 <chris@thebutlers.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 <chris@thebutlers.me> - -* Various updates including support for conint. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Various updates including support for conint. - -Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.me> - -* Various updates including support for conint. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Various updates including support for conint. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated generators to deal with new corner case where field is List[NonOscaObject] - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Cleanup fix_any. now 17 fail and 148 pass - -* Updates with 12 open UT's (#282) - -* Updated get_origin and other calls to ensure constrained lists are handled. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Various updates including support for conint. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Various updates including support for conint. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated generators to deal with new corner case where field is List[NonOscaObject] - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Update to ensure validator passes. Refactored some yaml examples to do so. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* More test fixes - -Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.me> - -* Various updates including support for conint. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Various updates including support for conint. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated generators to deal with new corner case where field is List[NonOscaObject] - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Update to ensure validator passes. Refactored some yaml examples to do so. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* More test fixes - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Corrected more UT's to new OSCAL models. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Corrected more UT's to new OSCAL models. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated unit tests for oscal 1.0.0rc - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated unit tests for oscal 1.0.0rc with corrected behaviour. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated documentation. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added pytest-random-order to dependencies. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Stripped out unused functions to boost test coverage. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: FrankSuits <frankst@au1.ibm.com> ([`992b317`](https://github.com/oscal-compass/compliance-trestle/commit/992b31743f4d1c4ce11d5b8c1ee69995856d0056)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat: Distributed load and trestle merge.(#272) +* boosted coverage and fixed smells -* 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 "Format and lint" - -This reverts commit 73ef3c83d9f5a4d071f7a422556a420d781b1306. - -* Revert "Restoring phantom changes from develop" - -This reverts commit a2b695e8dcce2b4a802438a726aabc0e0e1b8d80. - -* Revert "Restoring phantom changes from develop" - -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 <brunomar@au1.ibm.com> -Co-authored-by: Nebula Alam <anebula@au1.ibm.com> ([`dceae85`](https://github.com/oscal-compass/compliance-trestle/commit/dceae854c9e96ef2e66931efa9a0263b0470003e)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat: Misc cleanups of code for typing, unsafe functions, and other issues. (#274) +* fixed empty lists in header -* Adding more coverage for type checking and removing conflicts. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* feat: Updating to btest compatibility with python 3.9 - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Removed depricated "warn" function from use - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Update to clean up unit tests. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* More typing coverage. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`0652392`](https://github.com/oscal-compass/compliance-trestle/commit/06523929944351ce90ba83a85d57f0b04b323660)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat: Trestle import and unit testing +* fixed comment closure -* Bringing in clean import and test. -Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> - -* Added argument and return types. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* Anticipating TrestleError or some specific error in try blocks now. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* Linted. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* Fixed error logs for clarity. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* Simplified unnecessary try blocks with assertion on return code. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* Added a test for attempting to import a non-top level element. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* Linting. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* Tightened testing around just _run() for most tests, and cleaned up testing code comments. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* Added exception handler for file PermissionError. -Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> - -* Unnecessary str(). -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* Linting. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* Removing tempfile from test_import_cmd. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* Linted. -Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> - -* Testing load file failures through mocks. Added JSONDecodeError handler in import code. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`81b0a3c`](https://github.com/oscal-compass/compliance-trestle/commit/81b0a3c6d3815430d1203168084907dfc239cdc7)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat: Trestle remove commands including unit test coverage. +* fixed empty lists -* trestle remove and tests - -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* sample minimal catalog used in trestle remove testing - -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> - -* Handling errors without messy exit. Using logger instead of warnings. -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* Type hints for the return valies added. -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* Handling errors arising from file arg. -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> - -* Corrected log text. -Signed-off-by: Jeff Tan <jefferson.tan@gmail.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.tan@gmail.com> - -* Now covering 100%, tests response to failure of add_plan.execute(). -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> ([`a09e192`](https://github.com/oscal-compass/compliance-trestle/commit/a09e192b8a9ed2e8ccf362b38b4f9b2aecef54cd)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -### Fix +* improved description text -* fix: correct semantic release behaviour ([`c25d5be`](https://github.com/oscal-compass/compliance-trestle/commit/c25d5be7448ee956cd848a1476b5c9c70d72ab33)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* fix: Correct semantic release behaviour. +* fixed typo -Corrected semantic release behaviour. ([`caba993`](https://github.com/oscal-compass/compliance-trestle/commit/caba993013fed5b70ced84fc58d34345e042cb6c)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* fix: Refactor to use python and pytest internals for temporary paths and creating directories. +* fixed empty lists -* Refactored to use tmp_path everywhere - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Altered unit test to only use pytest inbuilt temporary directories. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Adding more typing and clearing up redundant functionality. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`1d99ca2`](https://github.com/oscal-compass/compliance-trestle/commit/1d99ca2ac96d76dfa777a0c514be582b382504de)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* fix: Small typo fix. +* initial fixes to pr -Trivial spelling fix. ([`2168bb2`](https://github.com/oscal-compass/compliance-trestle/commit/2168bb2b4d8fa79fbf93687a41265379cba608b8)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* fix: Generalized error expected after parent_model.oscal_read(file_path.absolute()) to handle any and return clean complaint. (#245) +* fixed list issues -Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> ([`b92ec8b`](https://github.com/oscal-compass/compliance-trestle/commit/b92ec8b40f15f121994eeb57b36e81a3a1b4c239)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -### Unknown +* fixed stings -* Merge branch 'main' into develop ([`df99bf8`](https://github.com/oscal-compass/compliance-trestle/commit/df99bf83c4b3326969ab31b070f71b95d38ecee4)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Corrected semantic release behaviour. +* responded to multiple pr changes -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`c147e94`](https://github.com/oscal-compass/compliance-trestle/commit/c147e9443993c37bb484a925e4a10c195c1eb1cd)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge pull request #289 from IBM/develop +* added test coverage -feat: Force update of version for release ([`e716524`](https://github.com/oscal-compass/compliance-trestle/commit/e716524db01f65ad0f9167143126743ea5de4be9)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge branch 'main' into develop ([`2c97d6c`](https://github.com/oscal-compass/compliance-trestle/commit/2c97d6c2ad0bf029a417ecfef1866d258ace201b)) +* fixed non-write of response prompt -* Merge pull request #288 from IBM/develop +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -feat: Release to support OSCAL 1.0.0rc1 ([`cbb39c4`](https://github.com/oscal-compass/compliance-trestle/commit/cbb39c4455274e9e27f335e0699eac92be25de02)) +* fixed repeat ssp gen issue -* Merge branch 'main' into develop ([`aad7018`](https://github.com/oscal-compass/compliance-trestle/commit/aad70181dfe4b8868345010fb5fd10000bcd329a)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* feat (remote): Adjustments for Windows environment. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`3cdc31f`](https://github.com/oscal-compass/compliance-trestle/commit/3cdc31f3054cc5b232d79976c47f460bb0a67923)) +* more fixes per pr feedback -* feat (remote): LocalFetcher can now refresh cache from file:/// or absolute path source. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`dc3f809`](https://github.com/oscal-compass/compliance-trestle/commit/dc3f80909d15e5f61617233af5c3a1b7bc6d754a)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feature (remote): Merged Jeff's changes pushed to feature/remote... ([`a0bfd41`](https://github.com/oscal-compass/compliance-trestle/commit/a0bfd41ac5fe0cfa3a95d59c47e2fd29ce76fe6e)) +* added tests for ssp_io and prune function -* feature (remote): added furl to setup requirements and began Github fetch... ([`1555f42`](https://github.com/oscal-compass/compliance-trestle/commit/1555f4286d73d0e17382328183531d7c1f897813)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge pull request #264 from IBM/docs/caching-spec +* sort pruned controls -docs (caching): typos and format fixes, explicit prohibition on unencrypted HTTP ([`b3fda9a`](https://github.com/oscal-compass/compliance-trestle/commit/b3fda9a4598541aaac48b65b7ae2881df3b48ea8)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge pull request #266 from IBM/feature/remote-jeff +* refactor cat interface -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)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote): Synchronizing with correct develop versions of test_utils, conftest, fs and trash. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`360835a`](https://github.com/oscal-compass/compliance-trestle/commit/360835a7209712a67c3dd90e47e327a8478f2bcc)) +* added typing -* feat (remote): Adopting trestle.utils.fs -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`df792bc`](https://github.com/oscal-compass/compliance-trestle/commit/df792bcddf5f30af815319c43f120ba647f838a3)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* feat (remote): Extended feature/remote cache.py and its unit test. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`4712eff`](https://github.com/oscal-compass/compliance-trestle/commit/4712effe78e36eb04d9568eb0634744d6949eabb)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> +Co-authored-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`f0de73a`](https://github.com/oscal-compass/compliance-trestle/commit/f0de73ad2152be75f456ff5a1b273d6c1d21988b)) -* Merge branch 'develop' into feature/remote -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`b2d3dc4`](https://github.com/oscal-compass/compliance-trestle/commit/b2d3dc4f9664c22d60d14a96975d2fc6d4fdd1c8)) +* feat: create separate markdown directories per source (#1242) -* Merge branch 'develop' into docs/caching-spec ([`c927861`](https://github.com/oscal-compass/compliance-trestle/commit/c9278611acdb2aeb809b62763e4f1fe15b66f661)) +* named dirs under comps works -* Specs now require HTTPS for fetching, while unencrypted HTTP is not allowed. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`98aabdb`](https://github.com/oscal-compass/compliance-trestle/commit/98aabdbe643d958dcaac00f9c2ff4804e2cb7c93)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* Fixed a few typos. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`474f693`](https://github.com/oscal-compass/compliance-trestle/commit/474f693e56878fb1d5716a42aad09b3bdf4f0fcc)) +* fixed ssp -* Fixed table. -Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`4e78f45`](https://github.com/oscal-compass/compliance-trestle/commit/4e78f4506bb03fb0768aaaa9ea908b0a652ca630)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* Merge branch 'develop' into feature/remote ([`582bae2`](https://github.com/oscal-compass/compliance-trestle/commit/582bae2abe077ee9a9c353f44131951c25df8beb)) +* fixed duplicate keys bug -* Merge pull request #261 from IBM/develop +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -Trestle release: task and import. ([`24de68c`](https://github.com/oscal-compass/compliance-trestle/commit/24de68ccd4a23ec306137cbdf931f1de03471eb5)) +* expanded test coverage -* Merge branch 'main' into develop ([`0b0b6c4`](https://github.com/oscal-compass/compliance-trestle/commit/0b0b6c4a3dad51bdce921099906347abc0a4d7df)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* Initial implementation of trestle task interface and sample task for testing. +* fixed bind -* Initial set of trestle task docs. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Additional details for tasks. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Initial implementation of trestle tasks. To be thoroughly tested. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Initial implementation of trestle tasks. To be thoroughly tested. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Stuff. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Altered logging behaviour to use improved logger. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Corrected unit tests - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Ready for merge - first trestle tasks. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Merged in removed and updated with appropriate logging changes - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Corrected behaviour. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d38d933`](https://github.com/oscal-compass/compliance-trestle/commit/d38d933b92e0f61f235532ade74d92e173d66349)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> +* fixed prune -## v0.4.0 (2020-11-24) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -### Chore +* fixed rules -* chore: Cleanup of trestle init to ensure correct return codes(#232) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* fix: Improvements in typing and return codes. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Initial trestle create - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added UT file - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added main file to allow running as "python -m trestle" - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Commit to allow merging - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Cleaned and as expected UT failures after merge - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated such that all models can generate - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added unit tests for generators. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Ready for review - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Fixed merge error - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Refactored init to use pathlib where possible - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* chore: Refactored init to use pathlib where possible - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`3c25a21`](https://github.com/oscal-compass/compliance-trestle/commit/3c25a215a1cc1d27fb0ca99a606356221e2969dd)) +* edited docs -* chore: Auto-update pre-commit hooks (#231) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> ([`157c9bf`](https://github.com/oscal-compass/compliance-trestle/commit/157c9bf99c279855f1027d996132777c614b750c)) +* addressed review comments -* chore: Auto-update pre-commit hooks (#222) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> ([`026541d`](https://github.com/oscal-compass/compliance-trestle/commit/026541df894be37664da9823f8ce25f8f0d1276c)) +* fixed try except block -* chore: Auto-update pre-commit hooks (#210) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> ([`daa70dc`](https://github.com/oscal-compass/compliance-trestle/commit/daa70dceaae62d1ae7576d19cb9c024deabf02cf)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`3ffbdb0`](https://github.com/oscal-compass/compliance-trestle/commit/3ffbdb04da1c72aba7b1304c0060d948d5501608)) -* chore: Adding interface for representing assembly of oscal models. (#198) +* feat: Add force-overwrite for generate (#1241) -* Created initial interface for exchanging oscal model trees - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added tests for interface and cleaned up code formatting - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated interface name to better reflect funcionality. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated unit tests to correct for name change. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`46934bc`](https://github.com/oscal-compass/compliance-trestle/commit/46934bc700c18d04f9e34d7783b1bf673428b0c1)) +* feat: Add force overwrite for generate -### Documentation +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* docs: Updated developer documentation with DCO and merge workflow. +* Update docs, increase coverage -* docs: Updated developer docs with workflow and DCO both requirements. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* docs: Updated developer docs with workflow and DCO both requirements. - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`041a7aa`](https://github.com/oscal-compass/compliance-trestle/commit/041a7aa8b2183a261827e5ee9d7d562849329e12)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -### Feature +* Reduce duplicates -* feat: Validation of duplicates now uses object factory (#216) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* 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)) +* Address review feedback -* feat: Completed trestle create implementation. +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* Initial trestle create - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added UT file - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added main file to allow running as "python -m trestle" - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Commit to allow merging - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Cleaned and as expected UT failures after merge - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated such that all models can generate - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added unit tests for generators. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Ready for review - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a73538f`](https://github.com/oscal-compass/compliance-trestle/commit/a73538f57f5bf4142c27f65a0b05834650f00cd7)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`d7612a9`](https://github.com/oscal-compass/compliance-trestle/commit/d7612a9a769d72e7a0338506aed4013b299519a7)) ### Fix -* fix: Additional test for trestle add (#227) +* fix: codeql update from v1 to v2 (#1310) -* 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 <anebula@au1.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`479413f`](https://github.com/oscal-compass/compliance-trestle/commit/479413f1e0d4f90ae3c89833f71ce3fbd7a3db69)) +* codeql to version 2 -* fix: for issue 229, another Any] still present in file (#230) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* 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)) +* updated docs -* fix: Improvements in typing and return codes. (#224) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`c382cb5`](https://github.com/oscal-compass/compliance-trestle/commit/c382cb593bf8b2f2b69810650320fdea544ed803)) +--------- -* fix: Refactor to adopt FileContentType consistently (#223) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`6731560`](https://github.com/oscal-compass/compliance-trestle/commit/6731560201a596a986906086bf1d337d5495a816)) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`793ea7c`](https://github.com/oscal-compass/compliance-trestle/commit/793ea7c353e4445b9a8911f3455656403cca0ca0)) +* fix: Give warnings when component references control not loaded by profile for comp-gen and ssp-gen (#1305) -* fix: handle anomalous GroupItems that were generating empty classes (#220) ([`8fae9dc`](https://github.com/oscal-compass/compliance-trestle/commit/8fae9dcc74f6067fe01fae0caee167e09a8b5d0f)) +* added tests -### Unknown +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Trestle release +* added comment -Merging from develop for a trestle release. ([`bc877fe`](https://github.com/oscal-compass/compliance-trestle/commit/bc877febbbcf4a9e8cd179d83f68ac3e1a390034)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Added test skeleton +* changed errors to warnings and checked warning text in tests -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d839b9b`](https://github.com/oscal-compass/compliance-trestle/commit/d839b9bb1ad2243ed20d0f2dee3409ed0a4db88c)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge pull request #229 from IBM/fix/missing_main +* removed unneeded logging commands -Added missing main file for running as a module. ([`d8c0683`](https://github.com/oscal-compass/compliance-trestle/commit/d8c0683a36ea8835b9e50358fb161831df6840ad)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Added missing main file for running as a module. +* addressed pr feedback -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`93f8e0a`](https://github.com/oscal-compass/compliance-trestle/commit/93f8e0a90fcaaeac105fffb3c77360ee1d029333)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* 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 <anebula@au1.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`f33eeda`](https://github.com/oscal-compass/compliance-trestle/commit/f33eeda6bf83c43269175fa03bbab4dddce4a87a)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`429b3c1`](https://github.com/oscal-compass/compliance-trestle/commit/429b3c19023f4232b0853818c6039629dce4dc26)) -* Initial implementation of trestle caching for local fs complete. +* fix: Temporary fix for the multiline control statement in catalog-assemble (#1308) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d01dfb5`](https://github.com/oscal-compass/compliance-trestle/commit/d01dfb5f3991701cb06a1f7735d94aba8fa5e98e)) +* fix: Temporary fix for the multiline statement bug -* Merge branch 'master' into develop ([`a99b19c`](https://github.com/oscal-compass/compliance-trestle/commit/a99b19c096322e94d24977572691ca4a8c927251)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* fix:add (#208) +* Fix objective part as well -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 <anebula@au1.ibm.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`bcbdae8`](https://github.com/oscal-compass/compliance-trestle/commit/bcbdae86a9ec8844208d9368b8b48429ed25c3ed)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> +* Make matching case insensitive -## v0.3.0 (2020-10-26) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -### Chore +* Delete trailing and leading new lines from the prose -* chore: Auto-update pre-commit hooks (#191) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`412edc0`](https://github.com/oscal-compass/compliance-trestle/commit/412edc0a1cddedfb3f6b82cb3125d2b9f69917c2)) +* Delete spaces -* chore: Separating pre-commit actions and creating an automatic update of precommit (#187) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -Signed-off-by: Chris Butler <chris@thebutlers.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: Ekaterina Nikonova <enikonovad@gmail.com> ([`7a7aa8c`](https://github.com/oscal-compass/compliance-trestle/commit/7a7aa8cf53c8361d79cc837615bbf7fae3b134c9)) -Signed-off-by: Nebula Alam <anebula@au1.ibm.com> ([`1187d7c`](https://github.com/oscal-compass/compliance-trestle/commit/1187d7c7a42164ce7bf165b04117e66cd4d6ddd7)) +* fix: boost test coverage for component generate and assemble (#1306) -* chore: Ensuring DCO bot does not limit core team access. (#183) +* boosted coverage comp_gen assem -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`40adb2d`](https://github.com/oscal-compass/compliance-trestle/commit/40adb2d9a7c9ee06de86d39c9490d867bc8198d3)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* chore: Add github static analysis (#153) +* simplified test code -Co-authored-by: Bruno <bruno.assis.marques@gmail.com> ([`3d27204`](https://github.com/oscal-compass/compliance-trestle/commit/3d272047c5014e836d93215f925ce0df7c5bdd1c)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -### Documentation +--------- -* docs: Initial caching structure documentation (#143) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`52b863b`](https://github.com/oscal-compass/compliance-trestle/commit/52b863b2ea684073afdb2ca85af7114ad43ac51c)) -* Initial cachinng structure documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated caching documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated caching documentation - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Bruno <bruno.assis.marques@gmail.com> ([`d1a73f3`](https://github.com/oscal-compass/compliance-trestle/commit/d1a73f314d42201fb7b9cbe79775a41b465ef6c7)) +* fix: ssp-generate error with components (#1303) -* docs: Updated readme to document current level of support for file formats (#179) +* initial fix of ssp gen issue -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Bruno <bruno.assis.marques@gmail.com> ([`1df2110`](https://github.com/oscal-compass/compliance-trestle/commit/1df2110eb9fb89816871ce70ceb72d5f3be18049)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -* docs: change of trestle model directory structure (#169) +* removed test -* update project model structure - -* Update directory structure on examples - -* Update test data examples on split and merge - -Fixes #162 - -Signed-off-by:: Bruno <brunomar@au1.ibm.com> ([`ed2ab36`](https://github.com/oscal-compass/compliance-trestle/commit/ed2ab36c64ddb45297974bb851819322477c0fd2)) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -### Feature +* enhanced test data for coverage -* feat(trestle add): Implements `add` functionality for trestle cmd. (#184) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* 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 <anebula@au1.ibm.com> ([`eb42656`](https://github.com/oscal-compass/compliance-trestle/commit/eb42656c60c0697ff2de806d4a57ee7b246363de)) +--------- -### Fix +Signed-off-by: Frank Suits <frankst@au1.ibm.com> +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`7a49a0a`](https://github.com/oscal-compass/compliance-trestle/commit/7a49a0a5e4a273755a2f6279a1cb51000cf02d40)) -* fix: Versioning tag was malformed. (#199) (#200) +* fix: adding multiple value set to rule param values during component … (#1301) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`957fe0b`](https://github.com/oscal-compass/compliance-trestle/commit/957fe0bf08a358e5ab21eb93c60dba65cc486b24)) +* fix: adding multiple value set to rule param values during component assemble -* fix: Versioning tag was malformed. (#199) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`5c84d59`](https://github.com/oscal-compass/compliance-trestle/commit/5c84d59c539773b18709968405cbe77ce27e6a99)) +* fixed test for multiple values. cleaned up debug/info msgs from comp assemble -* fix: support contextual element path like groups.* during split (#192) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Lenin Mehedy <lenin.mehedy@au1.ibm.com> ([`c9536b2`](https://github.com/oscal-compass/compliance-trestle/commit/c9536b2bcc6404fa9dab8787fcbf97e8590e4402)) +* cleaned up warning and info messages -* fix: correct directory names of sub models during split (#189) +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -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.mehedy@au1.ibm.com> ([`6b18237`](https://github.com/oscal-compass/compliance-trestle/commit/6b18237fda53f91f936fc122fdbf74da8e4db65e)) +* component -> component-def -* fix: reference to inexistent function (#182) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -Signed-off-by: Bruno <brunomar@au1.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)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Signed-off-by: Frank Suits <frankst@au1.ibm.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Co-authored-by: Frank Suits <frankst@au1.ibm.com> ([`c357e15`](https://github.com/oscal-compass/compliance-trestle/commit/c357e15691bb9eee553c8531edd1f4ce024f60a3)) -* fix: explicitly use contextual_model argument in path parsing util function +* fix: change python badge for addressing current python supported versions (#1300) -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: change python badge for addresing current python supported versions -* fix: do not create empty place holder file after splitting a dict or list ([`cb9fa8b`](https://github.com/oscal-compass/compliance-trestle/commit/cb9fa8be810c915198b094785ce581b89a54ce99)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> -* fix: create main model alias directory during split +* Fix docs page -If we split a catalog, the sub element files should be in `catalogs/` directory. If we split `catalog/medata.json`, it's sub elements should be put under `catalogs/metadata/` directory. ([`7656e42`](https://github.com/oscal-compass/compliance-trestle/commit/7656e420acedf5b2e61c5fb27b448196a362c521)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* 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)) +Signed-off-by: Alejandro Jose Leiva Palomo <alejandro.leiva.palomo@ibm.com> +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> +Co-authored-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`7a8d895`](https://github.com/oscal-compass/compliance-trestle/commit/7a8d895d5ca16e9c7ebbcf3c862c14721d4a6421)) -* fix: utility method to write/read Oscal List and Dict object to/from file correctly (#161) +* fix: allow edit of rule param values during component assemble (#1299) -* 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 <brunomar@au1.ibm.com> ([`43c7bdf`](https://github.com/oscal-compass/compliance-trestle/commit/43c7bdf5c30d88056999776e5df5fc9957842122)) +* comp gen assemble loads rule param vals -* fix: Updating fetch of NIST content. +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Initial set of pretty badges - -Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.me> ([`85a852a`](https://github.com/oscal-compass/compliance-trestle/commit/85a852a20fa33c1546a7f6cc64201809fb845fea)) +* updated docs -* fix: Merge pull request #158 from IBM/fix/issue_149b +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -chore: merging hotfix back into develop ([`75b11ca`](https://github.com/oscal-compass/compliance-trestle/commit/75b11ca91e0a23778511ac285b4655fbe12bd9f8)) +--------- -### Refactor +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`041a2c3`](https://github.com/oscal-compass/compliance-trestle/commit/041a2c3d567b91404a7bc63ebdb9689b8a447463)) -* refactor: adjust contextual helper methods for new structure (#180) +* fix: adding new components via markdown caused error (#1294) -Signed-off-by: Bruno <brunomar@au1.ibm.com> ([`5f14767`](https://github.com/oscal-compass/compliance-trestle/commit/5f14767166567f529e0dd28dcddb076c168ceece)) +* generalized last_modified setting -* refactor: rename fixture name for sameple_target to sample_target_def ([`788510b`](https://github.com/oscal-compass/compliance-trestle/commit/788510b08dd836e1dfce92520a8517cd345b524d)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -### Unknown +* boosted component coverage -* Merge branch 'master' into develop ([`4d77545`](https://github.com/oscal-compass/compliance-trestle/commit/4d7754504591239eca3af9bdf54f452e90f5eb8d)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge pull request #197 from IBM/develop +--------- -Merge for release ([`fe784d8`](https://github.com/oscal-compass/compliance-trestle/commit/fe784d84912bbd3c00b3b1651c9fd657abca05df)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`39fd590`](https://github.com/oscal-compass/compliance-trestle/commit/39fd590c85b7e2cf9b0e7770596def8c41e8ae98)) -* [ImgBot] Optimize images (#190) +* fix: problem in cat assemble with subgroups (#1291) -/docs/assets/Canonical_trestle_auditree_workflows.png -- 236.06kb -> 158.11kb (33.02%) - -Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com> - -Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`ad238c8`](https://github.com/oscal-compass/compliance-trestle/commit/ad238c84b5999f1c650109f7e61b276faf4d1b53)) +* fixed groups in catalog assemble -* feature: introducing mandatory mypy typing. (#174) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Basic mypy setup - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added code typing support to build pipeline checks - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Partial completion of mypy first pass. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated get_stripped_contextual_model - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Partial update towards zero mypy errors - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* updates - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Altered cicd to be permissive - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Altered cicd to be permissive - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Fixed UT's related to split - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated mypy conf to be a balanced severity - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ebde8e5`](https://github.com/oscal-compass/compliance-trestle/commit/ebde8e546bb5d3cb4ddb27f60b4ca0cbcd52f9c5)) +* added docs -* Feature/validate intra (#188) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* 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'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 - -* refactored - -* finalized dup uuid validation with doc - -* get alias from class - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b4b7090`](https://github.com/oscal-compass/compliance-trestle/commit/b4b709059b35f1b33860bec89c9aa5ecc836ec9c)) +--------- -* feature: implement trestle trash and RemovePathAction #69 (#186) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`88337a4`](https://github.com/oscal-compass/compliance-trestle/commit/88337a4b16a24c8391a60e99347aa34cdb65307f)) -* refactor: create trestle trash util module - -* feature: implement move_dir_to_trash and tests - -* feature: more functionalities in trestle trash module - -* feature: unit tests for trash recovery methods - -* feature: implement RemovePathAction ([`bcd19b5`](https://github.com/oscal-compass/compliance-trestle/commit/bcd19b561ce40af78fd9d95ff3cc17b782e37a3c)) +* fix: assignment representation for ssp was not doing the right things (#1273) -* Merge pull request #171 from IBM/fix/sub_model_split_154 +* fixed ASSIGNMENT_FORM parameter rep -fix: subsequent sub model split #154 ([`02bc9e1`](https://github.com/oscal-compass/compliance-trestle/commit/02bc9e16be9d721ce372ecd308374a9509443451)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Implement unit test and improve coverage #172 ([`10a441f`](https://github.com/oscal-compass/compliance-trestle/commit/10a441f68b68ac0982fde6330789f0df46330c43)) +* updated docs -* remove unused function ([`561c430`](https://github.com/oscal-compass/compliance-trestle/commit/561c4304d6583a38e416ccab91123de5178c321f)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Split should support chained element paths for multi-level split #172 ([`4e25e4f`](https://github.com/oscal-compass/compliance-trestle/commit/4e25e4f7cc0a50f17beab4cb8bcdaf12ca956c45)) +* assignment now means needs assignment -* Merge branch 'develop' into fix/sub_model_split_154 ([`4e8bb8c`](https://github.com/oscal-compass/compliance-trestle/commit/4e8bb8c135dc77a69b530970957b03c4220b5bd5)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Stop generation of timestamp in oscal files, import conlist as needed, fix regex strings (#173) ([`c731c33`](https://github.com/oscal-compass/compliance-trestle/commit/c731c336edab83ff888b399be0a5f0f891d0528d)) +* simplified param_str code -* only support split of first level childrent of a model ([`ef933d0`](https://github.com/oscal-compass/compliance-trestle/commit/ef933d0c0beec7c1c5f056004c6b241fe6c38ef2)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* add fixture for sample catalog and split unit test for catalog model ([`c923a99`](https://github.com/oscal-compass/compliance-trestle/commit/c923a998c5c75cc274bb0483b1f887b4a0da6351)) +* made assignment form more generic with prefixes -* refactor split tests ([`84bcd9f`](https://github.com/oscal-compass/compliance-trestle/commit/84bcd9f239a3a05caa709de5113deccb685f3c58)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* fix unit tests ([`0d9bc0d`](https://github.com/oscal-compass/compliance-trestle/commit/0d9bc0d997734ce0824bba2bb44a0aa0b145c79b)) +* made -bf consistent. started adding -sl -* Merge branch 'develop' into fix/sub_model_split_154 ([`bc912ce`](https://github.com/oscal-compass/compliance-trestle/commit/bc912ce091aaaabcf6a8bd259a4fd1248b4f95ae)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge pull request #160 from IBM/feature/clear_content_159 +* fixed label rep mode -CreatePathAction should have an option to clean the content of a file if it exists #159 ([`19018e2`](https://github.com/oscal-compass/compliance-trestle/commit/19018e2c1cd969887d08bf79805f9382ac32e14d)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Add unit test for directory ([`1338b1f`](https://github.com/oscal-compass/compliance-trestle/commit/1338b1fc4c2232ec6cfb1d0bcf5d177a46dcd1c7)) +* updated docs -* Include an option to clear content in CreatePathAction +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -https://github.com/IBM/compliance-trestle/issues/159 ([`f31a800`](https://github.com/oscal-compass/compliance-trestle/commit/f31a8007c311784ce914811ff0e9ef70eb1e6438)) +* fixed issue with -sl, boosted coverage, added to jinja docs -* Unit test for the bug fix ([`7da40fe`](https://github.com/oscal-compass/compliance-trestle/commit/7da40fee88489721c169386d3c578d668eef8021)) +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> -* Merge branch 'develop' into fix/issue_149b ([`24a51f3`](https://github.com/oscal-compass/compliance-trestle/commit/24a51f380be2aedcde397b45dbcccda37cfb000a)) +* pr feedback -* Merge pull request #157 from IBM/master +Signed-off-by: Frank Suits <frankst@au1.ibm.com> -Master ([`84e8882`](https://github.com/oscal-compass/compliance-trestle/commit/84e8882bfce7a82be75ec60aea35cdcc0ac187f9)) +--------- +Signed-off-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`cac2aa3`](https://github.com/oscal-compass/compliance-trestle/commit/cac2aa351530f76834d53d10e08252ffb0786327)) -## v0.2.2 (2020-10-15) +* fix: Remove attrs version pinning (#1280) -### Fix +Removing pinning of attrs version, as there seems to be no breaking dependency. +I tested this using poetry command -* fix: Merge pull request #155 from IBM/fix/issue_149b +Signed-off-by: Pritam <pritamdutt@gmail.com> +Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> ([`8260e03`](https://github.com/oscal-compass/compliance-trestle/commit/8260e03cddcf682ebdf931f2b262f58156c8f56c)) -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)) +* fix: Fix typo in the curl (#1278) -### Unknown +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`d7576d5`](https://github.com/oscal-compass/compliance-trestle/commit/d7576d5cc4e8536b1f94ca668b3b7b87e01f3148)) -* bugfix issue 149 - Union[A, A] -> Union[A, conlist(A, min_items=2)] ([`4f6f6a9`](https://github.com/oscal-compass/compliance-trestle/commit/4f6f6a970dcf0919d3a33500544a54651df92b07)) +* fix: rules at component level2 (#1259) -* Handle multiple element paths argument consistently during split #146 (#147) ([`8d7943a`](https://github.com/oscal-compass/compliance-trestle/commit/8d7943a537bb9e8191657245e6a2be2cdeddc729)) +* docs: create tutorial for task csv-to-cd -* add a few more helpers (#151) (#152) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* 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 <brunomar@au1.ibm.com> ([`f766486`](https://github.com/oscal-compass/compliance-trestle/commit/f766486eabe4e50bf3817eedf8cc65a2f50f839d)) +* docs: create tutorial for task csv-to-cd +Signed-off-by: degenaro <lou.degenaro@gmail.com> -## v0.2.1 (2020-10-14) +* Temporary disable pre-commit autoupdate -### Fix +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* fix: Merge pull request #144 from IBM/fix/issue_138_b +* docs: rules at component level -fix for issue #138 forward references in assessment_results ([`153b752`](https://github.com/oscal-compass/compliance-trestle/commit/153b752b0de05baa616ac8d83a107eeaa30b0e63)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -### Unknown +* fix: rules at component level -* fix for issue 138 forward references in assessment_results ([`f0aeaf3`](https://github.com/oscal-compass/compliance-trestle/commit/f0aeaf35be82203adb308ed6bfa24e7bf65caa29)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Merge pull request #141 from IBM/feature/split_merge_add +* Revise description: Resource_Instance_Type -Trestle split and foundational functionalities ([`251079f`](https://github.com/oscal-compass/compliance-trestle/commit/251079fceba1bc80283a064dd6de304733c7c42b)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Merge branch 'develop' into feature/split_merge_add ([`5db28de`](https://github.com/oscal-compass/compliance-trestle/commit/5db28de545e200a0e4e90a279fc46b0a19a2205f)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> +Co-authored-by: Ekaterina Nikonova <enikonovad@gmail.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`3633d1f`](https://github.com/oscal-compass/compliance-trestle/commit/3633d1f0f4bcd7ee481f7db382aab2b23e91687f)) -* Use get_stripped_contextual_model (#140) ([`b045583`](https://github.com/oscal-compass/compliance-trestle/commit/b045583e6d6ba7b411669208b68814e71cbe506b)) +* fix: trestle task csv-to-oscal-cd cannot handle whitespace (#1252) -* add get_stripped_contextual_model helper (#137) +* fix: trestle task csv-to-oscal-cd cannot handle whitespace -* add get_stripped_contextual_model helper - -Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`481f691`](https://github.com/oscal-compass/compliance-trestle/commit/481f6916745657befc96b04e9eded9c520f9b910)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Merge pull request #139 from IBM/feature/split-cmd +* Test cases. -Fix recursive model split for a chain of paths ([`88fd9c5`](https://github.com/oscal-compass/compliance-trestle/commit/88fd9c5579268f33ed59f103f9121bc0a7507fb3)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> -* Fixed typo ([`9b17ae3`](https://github.com/oscal-compass/compliance-trestle/commit/9b17ae35d9686d264875afe59bb3e0d05df42628)) +Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`ac4b5e0`](https://github.com/oscal-compass/compliance-trestle/commit/ac4b5e08a8233d7f807cd6824197dca45f12b17b)) -* Update example in method description for clarity ([`6209113`](https://github.com/oscal-compass/compliance-trestle/commit/62091130e47c21dc2c52aad0dd684fd233aa1742)) +* fix: Fix docs template validate flags (#1245) -* Fix typo and update comment ([`6fcd392`](https://github.com/oscal-compass/compliance-trestle/commit/6fcd3926cb8fdeac3e47e879cee7a5e5701201ae)) +* fix: Fix docs template validate flags -* Merge branch 'feature/split_merge_add' into feature/split-cmd ([`21aa9e8`](https://github.com/oscal-compass/compliance-trestle/commit/21aa9e8ab6e9e2d030b1d260d6a53ddb923157f8)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* Catch exception during Plan simulation and always run rollback ([`7845f68`](https://github.com/oscal-compass/compliance-trestle/commit/7845f68e672f704e6c82a58ff450e10d9b539b71)) +* Address feedback -* Fix recursive model split for a chain of paths ([`ecfed54`](https://github.com/oscal-compass/compliance-trestle/commit/ecfed5432fb1a1eefb0e39d296044ea07f76af1f)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* Reuse to_json method to reduce code duplication ([`b2549cf`](https://github.com/oscal-compass/compliance-trestle/commit/b2549cf40cb54df30800ae7950b97b75ea5e6413)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`6eac0c2`](https://github.com/oscal-compass/compliance-trestle/commit/6eac0c2c620d933761e9660021a5005490bf5ea5)) -* Fix parent model name in the element path during parsing ([`ebc8474`](https://github.com/oscal-compass/compliance-trestle/commit/ebc8474e6b873022a0f2cd221bfc3f31201f607e)) +* fix: Adjust documentation (#1248) -* Fix getting full element path recursively ([`897d2d2`](https://github.com/oscal-compass/compliance-trestle/commit/897d2d25cc9fcc56de0afb6a43d6705fd3bf380b)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* Extend functionality for detecting duplicate values in pydantic objects (#105) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`5b31925`](https://github.com/oscal-compass/compliance-trestle/commit/5b31925ac82042db98467552bfef415796ca57d3)) -* 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'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 <chris@thebutlers.me> ([`b0e3558`](https://github.com/oscal-compass/compliance-trestle/commit/b0e3558b3f1ce6332f7db199a017986eda27e362)) +* fix: Update flake8 in precommit (#1246) -* Merge branch 'feature/split_merge_add' into feature/split-cmd ([`139983d`](https://github.com/oscal-compass/compliance-trestle/commit/139983dd5f6af84c26bed31f19ed7847ebe58f02)) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> -* Fixed regex escape seq. so can again block w605 errors - issue 115 (#135) +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`a63b094`](https://github.com/oscal-compass/compliance-trestle/commit/a63b094ef05924ba8a8a600ff7ec5192bfe285d8)) -Co-authored-by: Lenin Mehedy <lenin.mehedy@au1.ibm.com> ([`c3b292f`](https://github.com/oscal-compass/compliance-trestle/commit/c3b292fe4deeeed1ebcd765d7e6777b8eb08fdfd)) +### Unknown -* add get_singular_alias helper (#136) +* Merge pull request #1312 from IBM/develop -* add get_singular_alias helper - -Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`984c94c`](https://github.com/oscal-compass/compliance-trestle/commit/984c94c3faa72ac506a1aa26f4555b2cd610afe1)) +chore: Trestle release ([`c41f873`](https://github.com/oscal-compass/compliance-trestle/commit/c41f873d0996b5100acf1952a0007201ef10a056)) -* Implement multi-level recursive split ([`dac9e3e`](https://github.com/oscal-compass/compliance-trestle/commit/dac9e3e546eb135dbcff678b49ae33cdc734794c)) +## v1.2.0 (2022-11-07) + +### Chore + +* chore: Optimize images for imgbot (#1234) + +* [ImgBot] Optimize images + +/docs/tutorials/ssp_profile_catalog_authoring/trestle_ssp_author_options.png -- 90.68kb -> 76.08kb (16.1%) + +Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com> + +* docs: edited docs + +Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com> +Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`17383ab`](https://github.com/oscal-compass/compliance-trestle/commit/17383abfbeb55adc4e34afdc2cec01a5899ee44e)) + +* chore: expand test coverage and make markdown more consistent (#1210) + +* fixed tests and clarified prompts for prose + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* refined parameters in yaml headers and added tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`6c551c6`](https://github.com/oscal-compass/compliance-trestle/commit/6c551c6fc4e220ed475f259af022ae366e6ed1fb)) + +* chore: Optimize images (#1152) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> ([`5ce472d`](https://github.com/oscal-compass/compliance-trestle/commit/5ce472d077dff4857bd8412c63827b1285e51f06)) + +* chore: Update documentation for the governed-documents (#1150) + +* chore: Update governed-document documentation + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Add picture + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Address pr comments + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`2b37cd9`](https://github.com/oscal-compass/compliance-trestle/commit/2b37cd9f47b7f36ff790624be9a1da504efeadc0)) + +* chore: Merge back version tags and changelog into develop. ([`58bc2a5`](https://github.com/oscal-compass/compliance-trestle/commit/58bc2a5cb0bcc11e15c05e40aaf3b3cabc8b01d7)) + +### Documentation + +* docs: update ssp and profile authoring guide to describe addition of parts (#1185) + +* updated help prose when control written + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated ssp authoring docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* major additions to content + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addressed feedback and grouped into details sections + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`35c3c78`](https://github.com/oscal-compass/compliance-trestle/commit/35c3c78105721712340a3ab1a9fbe3fdba44ac8e)) + +### Feature + +* feat: Allow trestle init to specify the purpose of initialisation (#1228) + +* feat: Add init modes + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Fix tests + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Address review feedback + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`8d02b68`](https://github.com/oscal-compass/compliance-trestle/commit/8d02b68d5cae32273e179494bafb235c2a004a22)) + +* feat: provide full path to controls in catalog including sub-controls (#1227) + +* added sub-control path to control + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added comment + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`ec96ee9`](https://github.com/oscal-compass/compliance-trestle/commit/ec96ee9067629b4d9932b39b2915b1b45bc6bae0)) + +* feat: get statement parts to allow easy capture of statement prose (#1221) + +* added get statement parts + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added check + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`708b6b5`](https://github.com/oscal-compass/compliance-trestle/commit/708b6b52e152ac4b21563f415cc0da3c8ca2ff8a)) + +* feat: remove default namespace and define generic trestle ns (#1215) + +* no-ns now working + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed ns references + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`105152b`](https://github.com/oscal-compass/compliance-trestle/commit/105152b15bab526429394ba398c3f512266086df)) + +* feat: made model equivalence check more rigorous (#1217) + +* reworked models_are_equiv + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed sizeof checks + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added tests and clarified fields_set when Nones possible + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`ab89b45`](https://github.com/oscal-compass/compliance-trestle/commit/ab89b45286dfbbfd1b3f4b9dc003246b4050b9e1)) + +* feat: allow profile-resolve to specify brackets around value (#1207) + +* added bracket format option + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tweaked docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* simplified test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`16d9dbc`](https://github.com/oscal-compass/compliance-trestle/commit/16d9dbcdc7fadaf7ddbbdd9c19b68e99777c4551)) + +* feat: show inherited props in yaml header for profile-generate markdown (#1198) + +* added profile flow tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tweak some code + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* more list comprehension + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* formalized merging of section_dicts from header and command line + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* inherited props now working + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed smells + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix: component generate will use sources in components if profile not specified (#1201) + +* fixed component generate with no profile given + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addressed pr change requests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* typing tweaks + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`d4b4680`](https://github.com/oscal-compass/compliance-trestle/commit/d4b4680e49ca8912ef34f0d472dc9997303227b8)) + +* feat: csv to oscal component definition (#1197) + +* feat: csv to oscal component definition + +* Address comments from Ekaterina. + +* PR fixes + +- one control impl per source +- property Rule_Id mistakenly omitted + +* Issue #1195 + +- rules should be at source level +- for each source level, all rules should be in single property set + +* Issue #1195 + +- in impl req for each control, there should be a set of properties one +for each rule with Rule Id same except for remarks removed + +* Issue #1141 + +- "unknown" columns become another property for that rule & use user +defined namespace +- two namespaces in config, one is "standard" and other is "user" + +* Issue #1141 + +Fix missing property + +* Issue #1141 + +- specify in config column name to class mapping (Rule Id and Rule +Description, and user specified columns) + +* Issue #1141 + +- class is missing from prop in ipml reqs +- Rule_description prop is coming twice + +* Issue #1141 + +- Add initial test cases > 90% + +* Issue #1141 + +- test coverage 100% for csv_helper.py + +* Issue #1141 + +- test coverage 100% for csv_to_oscal_cd.py + +* Issue #1141 + +- check for and employ catalog (just one allowed, presently) + +* Issue #1141 + +- catalog title into component-definition + +* Issue #1141 + +- remove config flag: catalog-file +- add config flag: title + +* Issue #1141 + +- add to config: version (of component definition) + +* Issue #1141 + +- do not put class on private columns + +* fix: csv to cd command + +Co-authored-by: Vikas <avikas@in.ibm.com> +Co-authored-by: Vikas Agarwal <75295756+vikas-agarwal76@users.noreply.github.com> ([`c6e8bad`](https://github.com/oscal-compass/compliance-trestle/commit/c6e8bad9f8c3feaab12778c90dde45830ab6ab01)) + +* feat: profile-resolve command to generate resolved profile catalog (#1194) + +* added tests and removed script + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* simplified test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* expanded coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added tests and responded to pr requests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed unneeded dir check + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`9faf572`](https://github.com/oscal-compass/compliance-trestle/commit/9faf5726a1bc1bf8c9263a4d84a472653e76ebf9)) + +* feat: added new parameter rep ASSIGNMENT_FORM to leave params in brackets with text (#1193) + +* initial refactor to controlinterface + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* changed parameter format to ASSIGNMENT_FORM, refactored ControlInterface, made some private functions public + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`d41b2b6`](https://github.com/oscal-compass/compliance-trestle/commit/d41b2b665b6e455288724347165f51b3078ac487)) + +* feat: allow culling headers from an existing md file (#1180) + +* working now + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added additional string test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed typo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* reverted markdownapi changes and moved to md_writer + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* reverted files for real + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed residual node code + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* typo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix typo boost coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* better culling of header content and added starting line to markdown node + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* handled pr feedback + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a0a0369`](https://github.com/oscal-compass/compliance-trestle/commit/a0a0369c53a7c06225e7e927aac8d8397f7b7c55)) + +* feat: handle display name and namespace (#1165) + +* initial fix of dup headers + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final fixes + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* changed default position to ending + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* prop ns now working + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* handled pr feedback and new approach for namespaces + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed bug with namespace on profile assemble + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added file encoding + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a898216`](https://github.com/oscal-compass/compliance-trestle/commit/a898216c812411646e263482393fd9669f43a5b2)) + +* feat: handle display name as property and initial handling of namespace option (#1162) + +* handle display-name + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`e6641fe`](https://github.com/oscal-compass/compliance-trestle/commit/e6641fea53e486d41df899f5adc73ee6d79c8e8c)) + +* feat: profile add props to control or part, and add prose to statement part (#1158) + +* improved component handling, cleaned up cache and import tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* component generate works with new format + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added control_read test with bad component header + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* enhanced coverage with updated test file + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* profile props working + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* labels work in profile + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* aggregated parts and adds in alters + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added props comment to yaml and refactored + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed smell + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* add profile title to generated markdown + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed package version limits for jinja and cryptography + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addressed pr requests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`541eddb`](https://github.com/oscal-compass/compliance-trestle/commit/541eddbfcbdf7b5fff6c4e6f765fda1a2f05bacf)) + +* feat: Add various docs md improvements (#1159) + +* feat: Add various docs md improvements + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Make lint happy + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Make lint fully happy + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Increase test coverage, address review comments + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`c93b4a1`](https://github.com/oscal-compass/compliance-trestle/commit/c93b4a1554697d184544634fc182bdc01cfe5790)) + +* feat: add component-generate and component-assemble (#1145) + +* initial sketch of author_component + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* initial implementation of author component + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* cleaned output + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed update_uuids.py + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed prose and clarified status consts + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improve typing for load top level model + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improved typing and formalized component imp status support + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* cleaned up status defines and removed connection to fedramp in ssp author + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* clarified status + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* comp-gen works with imp status and remarks + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* now make multi-comp markdown + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added sketch of comp assemble + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed docstrings + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added comp assem test coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* major refactor of control io + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* made some privates public + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* implemented context and tests pass + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed copy reference issue + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tests pass and lint ok + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* cleaned up doc strings + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed some smells + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added generic classes for ssp and comp_def + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* handle status and remarks better + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improved remarks handling + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improved test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* comp assemble working better + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addressed pr changes + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* enhanced component test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* temp fix to markdown version + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed small bug and enhanced test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed changes in comp generation and removed markdown version from setup.cfg + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a4caab2`](https://github.com/oscal-compass/compliance-trestle/commit/a4caab28c26b6391d4b258457c3009e960465a0f)) + +### Fix + +* fix: Use python 3.8 for the release (#1236) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`7a9fbe8`](https://github.com/oscal-compass/compliance-trestle/commit/7a9fbe8a1dba77357fd5b87136a56d9ad06bd3a0)) + +* fix: Update the docs for governed documents (#1219) + +* fix: Update the docs for governed documents + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Fix index + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Fix grammar + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`b38a809`](https://github.com/oscal-compass/compliance-trestle/commit/b38a809c95d04c269498c036df5bc1c198ab679e)) + +* fix: Fix a bug in governed section validation (#1231) + +* fix: Small bug in validation + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Fix typos + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`c7f3c0d`](https://github.com/oscal-compass/compliance-trestle/commit/c7f3c0d566c988c63979a3bfb40d351824898e3b)) + +* fix: add top level to parts output by get_statement_parts (#1230) + +* added high level statement part to query + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`597999e`](https://github.com/oscal-compass/compliance-trestle/commit/597999ef1898d5746e10b2fe706da7e4e57e936d)) + +* fix: change implementation prompt for part (#1229) + +* added for part to imp response + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added explicit function to find imp label + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`f929aba`](https://github.com/oscal-compass/compliance-trestle/commit/f929abab713612810434363f8fc8530553b4b51a)) + +* fix: empty dirs were created during comp-gen (#1225) + +* fixed issue + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`805c9f3`](https://github.com/oscal-compass/compliance-trestle/commit/805c9f3eb4b7cbd2ec717ae0cb0bec5cb0a2d37b)) + +* fix: issue #1222 (#1223) + +Co-authored-by: Vikas Agarwal <75295756+vikas-agarwal76@users.noreply.github.com> ([`96c7290`](https://github.com/oscal-compass/compliance-trestle/commit/96c72902b6b4411e21df658cef5119f7be486829)) + +* fix: better handling of params in component generate (#1220) + +* no-ns now working + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed ns references + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* refactor and split catalog write + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed arg flags + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* comp_gen fails + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* comp def works + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* changed to param values + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix to get title + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed smell + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed lambda loop + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed doc string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addressed pr feedback + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`2675e2f`](https://github.com/oscal-compass/compliance-trestle/commit/2675e2f1ff5823787819b4854b4e35e034a1c8bf)) + +* fix: csv to oscal cd task (#1208) + +* Issue #1141 + +- assure required columns present + +Signed-off-by: degenaro <lou.degenaro@gmail.com> + +* Issue #1141 + +- parameters + +* Issue #1141 + +Refactor code for quality improvement. + +* Issue #1141 + +- include missing columns +- fix several code smells +- fix bug in get_value + +* Issue #1141 + +- Fix code smells. + +* Issue #1141. + +- Fix code smell. + +* Issue #1141 + +- Code test coverage 100% + +* Issue #1141 + +- remove excess properties +- component description should be blank + +Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`049ee83`](https://github.com/oscal-compass/compliance-trestle/commit/049ee83f70e955fa92817222405adbc08f8deb5e)) + +* fix: simple fix for statement labels not showing properly (#1213) + +* removed bad break + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`8d8ae1e`](https://github.com/oscal-compass/compliance-trestle/commit/8d8ae1e5d388e2491e6558f1325ff4d22cc5a58d)) + +* fix: add profile title to comp-generate md and remove profile option (#1202) + +* removed profile option and added prof title to md + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed docstrings + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* reworked comp generate + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed status and rewrite issue + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* capture prose in description + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added prompt prose and test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`711597b`](https://github.com/oscal-compass/compliance-trestle/commit/711597b08490bcc8887d5970e376dc4c0e176df8)) + +* fix: component definition issues (#1200) + +* Issue #1141 + +- honor user_column.class in config file + +* fixed doc string + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`067fb91`](https://github.com/oscal-compass/compliance-trestle/commit/067fb9171b8396515cfb2dc6b06623a65cf81183)) + +* fix: prof resolve should use moustache form as default (#1196) + +* default to moustache + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed profile test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`530e28b`](https://github.com/oscal-compass/compliance-trestle/commit/530e28bf2143427b9b9dc1aa3cbfb4fb5c3ef2aa)) + +* fix: profile assemble 'after' and 'by-id' issue, and added resolve_profile_catalog script (#1190) + +* initial fix + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed linting + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* handle subparts in prof-gen -assemble + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed sub-part issue + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed oscal version and resolved cat name + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final tweaks to prof resolution and added tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> +Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> ([`4c772dc`](https://github.com/oscal-compass/compliance-trestle/commit/4c772dcf141b9ffd6c92c62fb7efa586f82bd272)) + +* fix: Pull display name from the resolved catalog (#1192) + +* fix: Pull display name from the catalog + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Small change + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`8cedd9f`](https://github.com/oscal-compass/compliance-trestle/commit/8cedd9f6ee4b45b8db762a81c2e59dfc83ce3504)) + +* fix: ssp-assemble was not capturing prose properly for control level imp req responses (#1191) + +* fixed comp def issue + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added doc + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`2a973cb`](https://github.com/oscal-compass/compliance-trestle/commit/2a973cb83ebaf925071c3bb59c0205b6e0387da3)) + +* fix: name of subparts added into statement should not be "item" (#1184) + +* changed item name assignment + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed jinja subparts test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`fcc79cb`](https://github.com/oscal-compass/compliance-trestle/commit/fcc79cb7db14385db1e2e174f27d18726ae4392e)) + +* fix: Add subparts to the markdown docs (#1182) + +* fix: Add adds subparts to the markdown docs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Make lint happy + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Make lint happy + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Address review comments + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`44e286b`](https://github.com/oscal-compass/compliance-trestle/commit/44e286ba1ba7369607b4299a13600c117fafd5ca)) + +* fix: parts labeled Control should be Part (#1176) + +* fixed part vs. control bug + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* sub parts mostly working except statement prose + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed control statement prose test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed control props during cat assemble + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed log msgs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed typo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed typo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`6287991`](https://github.com/oscal-compass/compliance-trestle/commit/62879916da55804bd7171ba51c6794ec021e36d5)) + +* fix: Fix various issues in markdown docs (#1174) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`4615be2`](https://github.com/oscal-compass/compliance-trestle/commit/4615be22ba4522455c441b8474aac45042606024)) + +* fix: prevent output of default namespace in markdown (#1173) + +* fixed output of ns + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`7ffc37e`](https://github.com/oscal-compass/compliance-trestle/commit/7ffc37e0f0ef67c9a30bb309a7cf7eee11a77c24)) + +* fix: combine parts props into a single add rather than two separate ones (#1172) + +* initial fix not working + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed order issue with by_ids + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed test after merge conflict + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a1ded2c`](https://github.com/oscal-compass/compliance-trestle/commit/a1ded2c08bb94c9b5b61ef828ac6fc73a3fb00c4)) + +* fix: only show missing value warnings when resolving a profile for ssp (#1171) + +* add show_value_warnings to control output of value warning messages + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`4afb7fc`](https://github.com/oscal-compass/compliance-trestle/commit/4afb7fc5b2cbb750bd4dbdd99e61825c04b61c07)) + +* fix: duplicate headers and statement parts added in wrong place (#1163) + +* initial fix of dup headers + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final fixes + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`ee505f5`](https://github.com/oscal-compass/compliance-trestle/commit/ee505f5b14a0281e9bda1365de7a4f2b15a5096b)) + +* fix: utf8 issue (#1160) + +* fixed utf8 issue + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated pre-commit + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`f1e2a9f`](https://github.com/oscal-compass/compliance-trestle/commit/f1e2a9fa0f44db46fd6674be29cbf1b7dd5bf14e)) + +* fix: Fix global headers validation when no drawio files are present (#1155) + +* fix: Fix headers validation + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Fix Sonar + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Fix review comments + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Fix typing + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`0d59427`](https://github.com/oscal-compass/compliance-trestle/commit/0d59427b89d3303b1392c08a7aa07a4ccdcab8a1)) + +* fix: component generate with new format, clean up of cache tests (#1153) + +* improved component handling, cleaned up cache and import tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* component generate works with new format + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added control_read test with bad component header + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* enhanced coverage with updated test file + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a5ab848`](https://github.com/oscal-compass/compliance-trestle/commit/a5ab848e836198b09fe819307a2931de072df400)) + +* fix: Handle adding/deleting section from the markdown control (#1154) + +* fix: Handle adding section to the control without alters + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Add tests + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Adress the reviews comment + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`40cd08b`](https://github.com/oscal-compass/compliance-trestle/commit/40cd08ba48522d20b26343690fb43f57580c610b)) + +* fix: Bump mkdocstring version (#1151) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`aad593b`](https://github.com/oscal-compass/compliance-trestle/commit/aad593b7fdf0a7019c736d5e464a7136f76f5085)) + +* fix: Correct typo in README (#1142) + +Signed-off-by: folksgl <Gfolks14@gmail.com> ([`160707a`](https://github.com/oscal-compass/compliance-trestle/commit/160707a2e2fc23879085263806e851584d2dd405)) + +* fix: Dont add empty template folder (#1140) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`cf7a63b`](https://github.com/oscal-compass/compliance-trestle/commit/cf7a63bea9b442d39af8f4dccda5f7d484314cf6)) + +* fix: allow catalog groups with no id and fix validation of links and reference matching (#1137) + +* fixed link counting issue + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* refined warning + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* make id changes in groups + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* enhanced group id warning + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added load_validate functions + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added more complete test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* import order + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* adjust warning messages + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`9e1b206`](https://github.com/oscal-compass/compliance-trestle/commit/9e1b20686b85d166cee98b444e8deb7f40c06b3e)) + +* fix: catalog-assemble was writing a new file when there were no changes to the file (#1139) + +* fixed overwrite issue caused by empty params list in assembled catalog + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* cleaned up + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`e6949e2`](https://github.com/oscal-compass/compliance-trestle/commit/e6949e276dd683f5f54072b7db29c9bf15335d34)) + +* fix: remove extraneous parens in unit tests. (#1138) + +* Remove extraneous parens in unit tests. + +* Fix comment. + +* Fix .pre-commit-config.yaml. ([`90cb2ee`](https://github.com/oscal-compass/compliance-trestle/commit/90cb2ee8f3d6b04c69971a542440ad66fec5188c)) + +* fix: Fix trestle version in the docs (#1134) + +* fix: Fix trestle version in the docs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Downgrade version of mkdocstrings + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Update docs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`d7d3cfc`](https://github.com/oscal-compass/compliance-trestle/commit/d7d3cfce8f2de248fc957a5146907cac118071a6)) + +* fix: Improve logging when validating headings in gov docs (#1133) + +* fix: Improve logging when validating headings in gov docs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Downgrade mkdocstrings for now + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`a641299`](https://github.com/oscal-compass/compliance-trestle/commit/a6412996d991c49261448b6eae80471d37ab2664)) + +### Unknown + +* Merge pull request #1237 from IBM/develop + +chore: Trestle release ([`85264e9`](https://github.com/oscal-compass/compliance-trestle/commit/85264e97c8cb8019b4478b121af7e5db258c5520)) + +* Merge branch 'main' into develop ([`5994c29`](https://github.com/oscal-compass/compliance-trestle/commit/5994c29581a59e34b16932c3a9c0cdb63a8b93c9)) + +* Merge pull request #1235 from IBM/develop + +chore: Trestle Release ([`ac6de64`](https://github.com/oscal-compass/compliance-trestle/commit/ac6de6416739a2ed0b77c314d5f4528a74885806)) + +## v1.1.0 (2022-05-24) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`babfc7e`](https://github.com/oscal-compass/compliance-trestle/commit/babfc7eef148d5d6ff9c31f72c44f10093aa7c23)) + +### Feature + +* feat: filter ssp by component + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`d675e49`](https://github.com/oscal-compass/compliance-trestle/commit/d675e4936151d0467362ada4442154cb841d87e2)) + +* feat: validate refs and resources in catalogs and models + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`1c17bf7`](https://github.com/oscal-compass/compliance-trestle/commit/1c17bf75df4ceab99c6f3ae68ee620e57738d592)) + +### Fix + +* fix: resolve pre-commit issue (#1126) + +* fix: resolve precommit issue + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix: updated doc string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`679cadc`](https://github.com/oscal-compass/compliance-trestle/commit/679cadc8bb839131d7a458b4b5cd082ed4535e24)) + +* fix: Do not validate extra files in author folders + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`25a1721`](https://github.com/oscal-compass/compliance-trestle/commit/25a172160c651411c1521507557450d49592561d)) + +* fix: better handling of child controls + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`c224f92`](https://github.com/oscal-compass/compliance-trestle/commit/c224f929ce2f9e682149e73055b7b195bbdaf92c)) + +* fix: remove unused classes from the generated oscal files + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`9a3ee20`](https://github.com/oscal-compass/compliance-trestle/commit/9a3ee20be9520bad084ac2df556eacbd23c7907f)) + +* fix: Allow subfolders in template folder + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`7223e1b`](https://github.com/oscal-compass/compliance-trestle/commit/7223e1b7d9dd8ef659867853a00cdbc7ca66a050)) + +* fix: updated documentation + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`8eca1f0`](https://github.com/oscal-compass/compliance-trestle/commit/8eca1f0abc4a62a6e1db34b32b4f615aff097c0d)) + +* fix: Add control id to the generated docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`b666956`](https://github.com/oscal-compass/compliance-trestle/commit/b666956adf221420b77a980eedec2ffc044d0e6e)) + +### Unknown + +* Merge pull request #1127 from IBM/develop + +chore: Trestle Release ([`7ee1088`](https://github.com/oscal-compass/compliance-trestle/commit/7ee10884fc72ed318c3e62dd72b27518b16e4bf5)) + +## v1.0.2 (2022-05-05) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`219bada`](https://github.com/oscal-compass/compliance-trestle/commit/219bada663cf6620c232718c50a6379c41473261)) + +### Fix + +* fix: check for circular imports during profile resolution (#1107) + +* now check circular imports + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`81469db`](https://github.com/oscal-compass/compliance-trestle/commit/81469dbcca3ffcb140ac09023b7de17671c4386b)) + +* fix: prevent moustaches in resolved profile catalog (#1106) + +* better handling of choice prose + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added new test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`f9edc81`](https://github.com/oscal-compass/compliance-trestle/commit/f9edc8185db30330cfe33d3cf02ef55e90135692)) + +* fix: Add ability to remove group title (#1114) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`4303d76`](https://github.com/oscal-compass/compliance-trestle/commit/4303d760935b0f34a13cccf9caaac4e90a05de83)) + +* fix: prevent blowfish warning due to new release of cryptography (#1112) + +* force backlevel cryptography due to blowfish issue + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added doc string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`f13fe31`](https://github.com/oscal-compass/compliance-trestle/commit/f13fe31ae4c790ef7b495c3f5418d3c26de96841)) + +### Unknown + +* Merge pull request #1115 from IBM/develop + +chore: Trestle bugfix release ([`746d239`](https://github.com/oscal-compass/compliance-trestle/commit/746d239ce64df487fae5bdbd5c727cfd132935cc)) + +## v1.0.1 (2022-04-27) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`77f0e50`](https://github.com/oscal-compass/compliance-trestle/commit/77f0e50bfe4e369a215401f9a4b9e56d193fd829)) + +### Fix + +* fix: bump readme refs to 1.0.x (#1103) + +* initial change to 1.0.x + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final changes for 1.0.x + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`488cd40`](https://github.com/oscal-compass/compliance-trestle/commit/488cd4003a97d0142cc65e91fa660dd2b83bd75b)) + +### Unknown + +* Merge pull request #1104 from IBM/develop + +chore: Trestle Stable Release OSCAL 1.0.2 ([`f992596`](https://github.com/oscal-compass/compliance-trestle/commit/f99259668f9faf8ed7af0b0a41beb8dc4b9d4cd4)) + +## v1.0.0 (2022-04-27) + +### Breaking + +* feat: updated to OSCAL 1.0.2 support (#1097) + +BREAKING CHANGE: pushed to OSCAL 1.0.2 + +* updated to oscal 1.0.2 and tests pass + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated readme and move oscal version + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated json oscal version to 1.0.2 + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* clarified wording re 1.0.0 and 1.0.2 + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a2aa3dd`](https://github.com/oscal-compass/compliance-trestle/commit/a2aa3dd53e67096004ba4e202fef8c7586462888)) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`4b6500e`](https://github.com/oscal-compass/compliance-trestle/commit/4b6500e58189db65254b9c13864fbb01cc4278a7)) + +### Documentation + +* docs: update readme and index md files (#1099) + +* updated readme and index + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tweaked docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`f0bd541`](https://github.com/oscal-compass/compliance-trestle/commit/f0bd5412be6bb7b9f88dc2ee3f6b1608c12a9268)) + +### Fix + +* fix: various task transformer improvements (#1100) + +* fix: various task transformer improvements + +for xlsx +- remove support for column "Version" +- add support for columns "goal_version", "rule_name_id", "rule_version" +- add support for profile-type generation "by-goal", "by-rule", +"by-control", "by-check" +- skip rows where control_id or goal_id is missing with complaint +- skip rows where control_id and goal_id are missing, after 100 +consecutive terminate processing +- improve sotring of controls + +for ocp4 +- give warning (not failure) when unable to extract title from +compliance-as-code rule.yml + +* "oscal-version": "1.0.2" + +* Fix code smell. + +* Do not emit parameters in the case of "by-control". + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`c869f37`](https://github.com/oscal-compass/compliance-trestle/commit/c869f37f9c942dc151ac729a6fa3506c375c9da7)) + +### Unknown + +* Merge pull request #1102 from IBM/develop + +chore: Trestle Stable Release OSCAL 1.0.2 ([`ca23972`](https://github.com/oscal-compass/compliance-trestle/commit/ca239723e0cb51f64d44a86c7b0d4fc98828d13e)) + +## v0.37.0 (2022-04-12) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`0850d21`](https://github.com/oscal-compass/compliance-trestle/commit/0850d21a38ac26e2c250c3fded5f5aca7a5e736d)) + +### Documentation + +* docs: small fixes to cli.md (#1091) + +* minor doc fixes + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* spreadsheet typo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`6206869`](https://github.com/oscal-compass/compliance-trestle/commit/6206869f12a16150fccb652896c1743add1a8c59)) + +### Feature + +* feat: bump feature with added docs (#1092) + +* updated doc + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final update + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`d1cdad3`](https://github.com/oscal-compass/compliance-trestle/commit/d1cdad3360a122cfa9bcd7ea8c3252369966f49e)) + +### Fix + +* fix: Cherry pick all fixes from the prerelease hotfix branch (#1090) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`06e1470`](https://github.com/oscal-compass/compliance-trestle/commit/06e147088ec0808bd04f7a5f4a10dc1f13bb7275)) + +* fix: Improved filtering column matching. (#1082) + +* Improved filtering column matching. + +* Fix lint. + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`712822e`](https://github.com/oscal-compass/compliance-trestle/commit/712822e387c592f667a763ede6f145590a9b088e)) + +### Unknown + +* Merge pull request #1093 from IBM/develop + +chore: Trestle Stable Release OSCAL 1.0.0 ([`0c09ed9`](https://github.com/oscal-compass/compliance-trestle/commit/0c09ed9cbae909a2e833335f06684b60540f01b5)) + +## v0.36.0 (2022-04-04) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`acf1143`](https://github.com/oscal-compass/compliance-trestle/commit/acf11432fe455474425cf7245bfe55b85294cad7)) + +### Documentation + +* docs: update ssp and profile authoring document (#1075) + +* fixed issue with cat-assem overwrite when same + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed pro assem when no change + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed ssp assem + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed doc names + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* initial update + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final doc changes ssp + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`4211529`](https://github.com/oscal-compass/compliance-trestle/commit/42115298bb835885eb6662d8dabfcd68e05b1f59)) + +### Feature + +* feat: Add ability to generate multiple markdown files using Jinja (#1077) + +* Add ability to generate multiple markdown files with sections + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Add docs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Add more tests + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Use sorted id flow + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`f41fc9f`](https://github.com/oscal-compass/compliance-trestle/commit/f41fc9fe3df95985f50ef29e09be07962fc8a7e9)) + +### Fix + +* fix: profile tools now handle choice and label properly (#1078) + +* fixed loops + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added text for second column + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed typo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* choice update working now + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed unneeded check + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`4d9363a`](https://github.com/oscal-compass/compliance-trestle/commit/4d9363ab827cc3d26a032336b35a50feec9a59ad)) + +* fix: jinja control loops sort controls better (#1076) + +* fixed loops + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added text for second column + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed typo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`d89128b`](https://github.com/oscal-compass/compliance-trestle/commit/d89128b83deddcd64dfab00d0a7ddcabe8415349)) + +* fix: catalog name confusion and overwrite of same assembled files (#1074) + +* fixed issue with cat-assem overwrite when same + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed pro assem when no change + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed ssp assem + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed doc names + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addressed review requests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`1ba9a35`](https://github.com/oscal-compass/compliance-trestle/commit/1ba9a35dee356e3b8df0fedbad30d9a420fa4e79)) + +* fix: trestle transformation tasks naming convention. (#1071) + +* Rename cis-to ... ocp4-cis-profile-to-catalog,cd + +* component-definition + +* oscal-profile-to-osco-profile + +* docs + +* fix bug + 100% code coverage for ocp4-catalog + +* tanium-report-to-oscal-ar + +* docs + +* Legacy. + +* Update test name. + +* OSCO result + Tanium result fixes. + +* Fix missed re-names. + +* Simplify tests. + +* Remove logger.error + +* Fix Code Smells. + +* Fix code smells. + +* paths constants + +Signed-off-by: degenaro <lou.degenaro@gmail.com> ([`d179d78`](https://github.com/oscal-compass/compliance-trestle/commit/d179d78671f2926c1651ad1eaa8f906f8c2aaefb)) + +* fix: delay choice subst (#1072) + +* first attempt + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* param choice subst works + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* better handling of setparams and ssp table + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* ssp_io coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* more realistic names + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* cleaned up choices and moustaches + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* choice sub happens at last stage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* update docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* add new profile + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed smell + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`16cf5e4`](https://github.com/oscal-compass/compliance-trestle/commit/16cf5e4374ce5f304cd491d1dc1e30de07e6a293)) + +* fix: param choice substitution works properly (#1070) + +* first attempt + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* param choice subst works + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* better handling of setparams and ssp table + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* ssp_io coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* more realistic names + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* cleaned up choices and moustaches + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`181f586`](https://github.com/oscal-compass/compliance-trestle/commit/181f58697ef18b114dd339e0ac903ee52bfa6c97)) + +* fix: use set-parms of CD ctl-impl for alternatives; discard catalog hack (#1068) + +* fix: use set-parms of CD ctl-impl for alternatives; discard catalog hack + +* Oops, misc. debug junk to be removed. + +* Improve function descriptions. + +* Various fixes. + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`d9e75e7`](https://github.com/oscal-compass/compliance-trestle/commit/d9e75e78b53851232adc635eca4f224e4c05d81a)) + +* fix: Fix Jinja dependency version (#1069) + +* fix: Fix Jinja version + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Add init file + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* added comment to config.ini + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added keep_cwds + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added root info output + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated setup.cfg + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed brackets + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* again + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* setup requires + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* latest setuptools_scm + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* limit setuptools + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* limit both + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* try again + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* try explicit ini + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added .md + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* again + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added jinja + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added more + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* now use latest setuptools and setuptools_scm + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Frank Suits <frankst@au1.ibm.com> ([`34c703a`](https://github.com/oscal-compass/compliance-trestle/commit/34c703abca210c9e2c2d4675822119214f1bf3e5)) + +* fix: added methods in catalog interface to sort controls by sort-id (#1067) + +* provide sort by sort-id when using catalog_interface + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed doc string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`dd04292`](https://github.com/oscal-compass/compliance-trestle/commit/dd04292d41090fb951b5a6284356e41c6a07d62a)) + +* fix: lock oscal to release-1.0.0 (#1065) + +* point nist-source to release 1.0 + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* lock oscal to 1.0.1 patch + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* now at v1.0.0 + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated nist-content to tags/v1.0.0 + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* moved nist-source again + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`1e6b554`](https://github.com/oscal-compass/compliance-trestle/commit/1e6b5547ed53b82e45f0c9478cc91970c8980d29)) + +### Unknown + +* Merge pull request #1080 from IBM/develop + +chore: Trestle Beta Release ([`8859463`](https://github.com/oscal-compass/compliance-trestle/commit/885946305b750bc96117915f420f74f24873ab6b)) + +## v0.35.0 (2022-03-22) + +### Chore + +* chore: remove catalog_helper and use functionality in catalog_interface (#1061) + +* moved validator_helper to model_utils + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* changed doc string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* docs validate + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* initial removal of catalog_helper + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed cat_helper + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* docs validate + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed tg + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed bad loop references + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`4a60a20`](https://github.com/oscal-compass/compliance-trestle/commit/4a60a2037698e0c796b598557a5bdd94d0293e4e)) + +* chore: move val helper (#1060) + +* moved validator_helper to model_utils + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* changed doc string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* docs validate + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed unneeded TG + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`8864d5d`](https://github.com/oscal-compass/compliance-trestle/commit/8864d5d41da388363e4d8b58f2ecf80cb8415bb3)) + +* chore: Remove error duplicates and standarize exceptions part 2 (#1058) + +* Remove the rest of logger errors + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Remove useless debug line + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Remove more duplicated logs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Change debug logs to trace + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Small change + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`484de2c`](https://github.com/oscal-compass/compliance-trestle/commit/484de2cb2f0957bcf062eb143dd8791a08e8a55e)) + +* chore: Remove error duplicates and standarize exceptions (part 1) (#1052) + +* chore: Example of logging and exception handling + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Convert more files to the common structure + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* More changes + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`4f92845`](https://github.com/oscal-compass/compliance-trestle/commit/4f928451e7a3a44d9e240627ce1cdf9056304503)) + +* chore: Optimize images (#1054) + +/docs/tutorials/ssp_profile_catalog_authoring/trestle_ssp_author_options.png -- 55.51kb -> 44.47kb (19.9%) + +Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com> + +Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`85bfd94`](https://github.com/oscal-compass/compliance-trestle/commit/85bfd941213dc8ecaa389ff2150a5e2be62b30d9)) + +* chore: increase coverage and remove checks for dict that arent needed after OSCAL 1.0.0 (#1039) + +* initial cleanup of dicts + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed typo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* attempt fix for 3.7 + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* responded to pr change requests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`e84855e`](https://github.com/oscal-compass/compliance-trestle/commit/e84855e160e730991f7d85ae57baf5c42fca4e56)) + +* chore: Refactor utils and split common functionality into logical parts (#1000) + +* chore: Refactor utils + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Update docs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Change imports + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Fix test import + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Rename utils + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Update docs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Address feedback + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`4fb833d`](https://github.com/oscal-compass/compliance-trestle/commit/4fb833df34129498894e36c00210aa7fd001719a)) + +* chore: Merge back version tags and changelog into develop. ([`38492fa`](https://github.com/oscal-compass/compliance-trestle/commit/38492fae9b7ea921857457d34348a8d448b8d6df)) + +### Documentation + +* docs: ssp tutorial update (#1034) + +* updated ssp authoring tutorial + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added comment + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addressed review requests to clarify docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final doc tweaks + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* force flake8 not to run parallel + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* jobs set to 1 in setup.cfg + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* jobs=1 in makefile + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* edited yaml + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tweaked yaml + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* disabled flake8-bandit, updated ssp docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`12ab44f`](https://github.com/oscal-compass/compliance-trestle/commit/12ab44f39a15f8de0388cf7ffab3cce44bc396cf)) + +* docs: Fix typo personell->personnel. (#1014) + +Signed-off-by: Alexander Stein <alexander.stein@nist.gov> ([`f3041be`](https://github.com/oscal-compass/compliance-trestle/commit/f3041beea9ea6093bc7b462521c9cff325cf9f4b)) + +### Feature + +* feat: xlsx filter (#1050) + +* Check for xlsx-to-profile required config vars. + +* Support for filter-column. + +* Feat/xlsx filter. + +* Fix code review items. ([`9f63412`](https://github.com/oscal-compass/compliance-trestle/commit/9f6341257f755e49173050b4d0f2e32c75874610)) + +* feat: xlsx-to-oscal-profile (#1046) + +* feat: xlsx-to-oscal-profile + +- create common xlsx module +- create xlsx-to-oscal-profile task +- artifacts for 100% code coverage + +* fix lint error - mkdocs + +* Relocate xlsx_helper. + +* Refactor common code. + +* Refactor. + +* Refactor. + +* Code smell. + +* Code smells. + +* Use "public" URL in test data. + +* Fix: year is 2022 in code copyright. + +* fix: list_utils is_ordered_sublist + +* Ugh. lint. + +* Update cli.md with new changed task name. + +* Add xlsx-to-oscal-profile to cli.md. + +* Tweak. + +* Ugh. mdformat. + +* Reduce duplicate code. ([`9695933`](https://github.com/oscal-compass/compliance-trestle/commit/96959339818baaa06b0a9c00dedae81c9c99dcec)) + +* feat: Resolve UUID Imports During Profile Resolution, Not Only Explicit Imports (#1023) + +* feat: Resolve import uuid anchor during profile resolution. + +Signed-off-by: Alexander Stein <alexander.stein@nist.gov> + +* feat: Add profile resolv docs + +And of course reach to the two commit minimum for the PR. :-) + +Signed-off-by: Alexander Stein <alexander.stein@nist.gov> + +* feat: Check for missing resources pre-assignment + +Tests wisely indicate that a profile.back_matter, can have a falsey None +value for resources and there should a conditional assignment test before +to ensure that. + +Signed-off-by: Alexander Stein <alexander.stein@nist.gov> + +* feat: Add with @fsuit's feedback. + +Signed-off-by: Alexander Stein <alexander.stein@nist.gov> ([`ae803e7`](https://github.com/oscal-compass/compliance-trestle/commit/ae803e74cda58694a294ccfe1e979f2993626ec8)) + +* feat: aggregate properties as results level (#997) + +* feat: aggregate properties as results level + +* fix code smell. + +* Generalize common property removal from observations. + +* Use @classmethod annotation. + +* Undo @classmethod annotation. + +* mkdocs + +* Tanium - result per local definition with aggregate properties. + +* Use if x: rather than if len(x) > 0: for most circumstances. + +* Handle empty local-definitions. + +* List comprehension. + +* Employ set intersection. + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`174aabe`](https://github.com/oscal-compass/compliance-trestle/commit/174aabe401b9fbe35a10efcc9df159a3537d3c0d)) + +* feat: Validate OSCAL directories (#990) + +* feat: Validate OSCAL directories + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Add yaml extension + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Clean up tests + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Make keep files hidden on windows + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Make keep files hidden on windows + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Address feedback + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Address review feedback + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Typo + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`941e4fc`](https://github.com/oscal-compass/compliance-trestle/commit/941e4fc6fe9e3c4700f4f7c43be849fb176fb57d)) + +### Fix + +* fix: use control sort-id for sorting (#1062) + +* implemented sort-id + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improved docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* no cover as needed + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* clarified sub name + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed iterations + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* consistent handling of sort-id + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`fb65bfb`](https://github.com/oscal-compass/compliance-trestle/commit/fb65bfbaadca2240f535d7db057baed108ec0bf2)) + +* fix: task tanium-to-oscal poor aggregation performance (#1053) + +* fix: task tanium-to-oscal poor aggregation performance + +* Ugh. docs. + +* Fix review items for cache.py + +* Fix for comments on list_utils.py + +* Fix review items for tanium.py + +* Improve aggregation performance. + +* Remove obsolete code. + +* Docs. + +* Types. + +* Add test for list_utils and fix bug! + +* Improve function name and test. + +* Add unit tests for transformer helper. + +* Skip accounting when not needed. + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`9ea118c`](https://github.com/oscal-compass/compliance-trestle/commit/9ea118c472b83491a30bbeabe35afbc35fd4e96d)) + +* fix: avoid write of new file if no changes after -assemble (#1057) + +* update timestamps + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* profile assemble write only on change + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* no overwrite ssp assemble + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* cleaned up ssp overwrite + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed transform tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* all write on assemble will check for change + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* modified docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed typing + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* changed to last_modified + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`893eec6`](https://github.com/oscal-compass/compliance-trestle/commit/893eec6afcf6eaaa9f831528995de267a0cabe6b)) + +* fix: update timestamps for all assemble tools (#1056) + +* update timestamps + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* handle last_modified missing + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`cccd7a2`](https://github.com/oscal-compass/compliance-trestle/commit/cccd7a2e9399bf001ab101a405f370d92c1d000c)) + +* fix: flake8 bandit reenable, remove transformcmd, empty config.ini (#1055) + +* enabled flake8-orbit and emptied config.ini + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed xform cmd + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* disable password check in cache.py + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* try again + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* noqa on correct lines + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* reran mkdocs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a7543c2`](https://github.com/oscal-compass/compliance-trestle/commit/a7543c24c80b6904a27a678aff3bce357fc44629)) + +* fix: more complete parameter info in yaml headers (#1049) + +* added param_to_dict and reverse + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed tests with full parameter + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed smell + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* params without values also output by default + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* reworked profile assemble setparams + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tweaked help string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* redid using profile-values + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed dead code and updated docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed typo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed ohv + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`7a3b098`](https://github.com/oscal-compass/compliance-trestle/commit/7a3b098d2ef9f88f564908927240524021d5c768)) + +* fix: block withdrawn controls from being written as markdown (#1045) + +* updated ssp authoring tutorial + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added comment + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addressed review requests to clarify docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final doc tweaks + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* force flake8 not to run parallel + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* jobs set to 1 in setup.cfg + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* jobs=1 in makefile + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* edited yaml + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tweaked yaml + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* disabled flake8-bandit, updated ssp docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* initial move of add as part of create command + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docstrings + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed add test docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* clarified json yaml in add + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* dont write out withdrawn controls + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* more doc strings + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* lowercase check for withdrawn + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added function to remove withdrawn controls from catalog + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`053ab0e`](https://github.com/oscal-compass/compliance-trestle/commit/053ab0eac098104ed062acb80b4b65f419d37323)) + +* fix: remove add command and incorporate it into the create command (#1036) + +* updated ssp authoring tutorial + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added comment + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addressed review requests to clarify docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final doc tweaks + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* force flake8 not to run parallel + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* jobs set to 1 in setup.cfg + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* jobs=1 in makefile + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* edited yaml + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tweaked yaml + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* disabled flake8-bandit, updated ssp docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* initial move of add as part of create command + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docstrings + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed add test docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* clarified json yaml in add + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* more fixes of docs after moving add to create + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed mdformat + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* typos + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* typo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`ddde5f5`](https://github.com/oscal-compass/compliance-trestle/commit/ddde5f537158f5621f3d5d0a06791400076d4a4f)) + +* fix: Improve column heading matching. (#1035) + +* fix: Improve column heading matching. + +* Spelling fixes. + +* Standardize task name and remove extraneous typing. + +* Fix code-format. + +* Fix docs. + +* Reduce code smells. + +* Fix code smells. + +* Fix code smells. + +* Fix code smells. + +* Fix code smells. + +* Fix code smells. + +* Fix code smells. + +* Fix code smells. ([`a51fa1e`](https://github.com/oscal-compass/compliance-trestle/commit/a51fa1e9a953dd84e88c344b4d8368d90e9cea41)) + +* fix: improve sections (#1033) + +* normalized commands and added required-sections + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improve handling of sections_dict + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* sections better and fixed args issue + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* ready to prompt for params + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* required sections working + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added allowed sections + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* address PR change requests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* trestle_root should be path + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`8e6c632`](https://github.com/oscal-compass/compliance-trestle/commit/8e6c632237747e6e75cf24886418438a25ae46f1)) + +* fix: consistent author commands and support for required-sections (#1030) + +* normalized commands and added required-sections + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improve handling of sections_dict + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`08953d1`](https://github.com/oscal-compass/compliance-trestle/commit/08953d19a2144f98051b33917eca534521de115c)) + +* fix: profile params (#1015) + +* updated docs and abstracted string formatting of params + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added param_id + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed param_id + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added comments + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* more control over parameter formatting + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* minor bug + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage and enabled cat assemble into orig catalog + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* converted preserve_header_values to overwrite_header_values + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addresed review questions + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`30c0ec1`](https://github.com/oscal-compass/compliance-trestle/commit/30c0ec1097140c9e88bc43f46a2ccc7a1273f81e)) + +* fix: 2 bugs xlsx-to-oscal-component-definition (#1017) ([`81d4bf2`](https://github.com/oscal-compass/compliance-trestle/commit/81d4bf2682dacaba3ee09061a790e8a2c15564a4)) + +* fix: updated documentation for trestle (#1006) + +* fix: updated documentation for trestle + +* fix: updated documentation + +Co-authored-by: Vikas <avikas@in.ibm.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`8d3187d`](https://github.com/oscal-compass/compliance-trestle/commit/8d3187dd27cbf2fec0eab787bf6b19ddceebf519)) + +* fix: missing params in generated catalog and better hidden file handling on windows (#999) + +* initial cleanup + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed missing params in catalogs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* setting param values rather than label + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`c4550f5`](https://github.com/oscal-compass/compliance-trestle/commit/c4550f541c53327bac3ad38f1feaf262d0b9be27)) + +* fix: Second stage code cleanup and dead code removal (#993) + +* reverted utils change + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final cleanup + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addressed pr review changes + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`79b2f61`](https://github.com/oscal-compass/compliance-trestle/commit/79b2f61baac7adbf69e1474a5e218d664bec65ff)) + +* fix: cleanup phase I including split of profile_resolver (#991) + +* initial cleanup including prof resolver split + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed parse_file + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* function to query verbosity + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* cleaned up repository + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* as_list and prof resolver + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated mkdocs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* address pr feedback and more cleanup + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* regen of docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* made log calls private + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`39134aa`](https://github.com/oscal-compass/compliance-trestle/commit/39134aad2ee55e60a89f59c691dc145008b77206)) + +* fix: allow trace logging with verbose level 2 (#989) + +* initial version of trace logging + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added example + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`7b4b349`](https://github.com/oscal-compass/compliance-trestle/commit/7b4b34955020ff5f2608c0f9af84520f45cb86f7)) + +* fix: README documentation improvements (#987) + +* Remove redundant dot + +Signed-off-by: Guy Zylberberg <guyzyl@gmail.com> + +* Add pip install command line + +Signed-off-by: Guy Zylberberg <guyzyl@gmail.com> + +* Grammer improvements + +Signed-off-by: Guy Zylberberg <guyzyl@gmail.com> + +* Add reference to Python installation guide + +Signed-off-by: Guy Zylberberg <guyzyl@gmail.com> ([`0ad4996`](https://github.com/oscal-compass/compliance-trestle/commit/0ad499611c3fd6a0c0e8dc258bb1dd8190e4bfba)) + +* fix: change verbose assignments from boolean to integer (#988) + +* added link to trestle ssp demo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* did pre-commit properly + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`6aed714`](https://github.com/oscal-compass/compliance-trestle/commit/6aed7142334af6ee97345248224d05de875eae12)) + +### Unknown + +* Merge pull request #1064 from IBM/develop + +chore: Trestle release ([`79d828e`](https://github.com/oscal-compass/compliance-trestle/commit/79d828e96f6a721bdc55eadd02247277a579a750)) + +* Optimize images (#1038) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> +Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> ([`9ccce98`](https://github.com/oscal-compass/compliance-trestle/commit/9ccce98ff03b535f7ea3dc6790e05cd5b310c9bc)) + +## v0.34.0 (2022-01-07) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`496973a`](https://github.com/oscal-compass/compliance-trestle/commit/496973afeb1c3bfa697bf1fa4705764008ffd8d8)) + +### Documentation + +* docs: update ssp workflow and minor changes to other docs (#985) + +* updated ssp docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* additional edits and validation of docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* typo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`45be184`](https://github.com/oscal-compass/compliance-trestle/commit/45be1842d1fdc634d8ae9b5b404da4e59ea13d18)) + +### Feature + +* feat: Add custom parameter wrapping to jinja (#976) + +* feat: Add custom parameter wrapping to jinja + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Fix docs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Address feedback + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`4289ca0`](https://github.com/oscal-compass/compliance-trestle/commit/4289ca0bd1cac83146a4f9080e0eb7f766d78db3)) + +* feat: add jinja datestamp output (#970) + +* feat: add jinja datestamp output + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* update doc formatting + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* fix deprecation warning for number captions regex + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* mdformat for docs addition + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* add tests for md datestamp + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* add test case for invalid jinja tag + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* use const for datestamp format string + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* update docs for new datestamp format + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> +Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> ([`2b92da1`](https://github.com/oscal-compass/compliance-trestle/commit/2b92da100f0646dabf3a56a6544dd72bc66c4958)) + +* feat: add optional numbering of figures and tables when generating md… (#964) + +* feat: add optional numbering of figures and tables when generating md ssp using jinja + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* fix lint errors + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* add tests for number caption & bug fix + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> +Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> ([`89bafe7`](https://github.com/oscal-compass/compliance-trestle/commit/89bafe7f1fcfe3fe1db4900be483f8416fb824b7)) + +### Fix + +* fix: OCP4 CIS Component Definition rules should have unique descriptions (#975) + +* fix: OCP4 CIS Component Definition rules should have unique descriptions + +* Use consistent json format for selected & enabled rules. + +* Revise tutorial: use 3 selected rules to reduce comp-def.json size. + +* Use https. + +* Add types to parameters and return value of method _get_title. + +* Add detailed operational description to method _get_title. + +Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`299db5a`](https://github.com/oscal-compass/compliance-trestle/commit/299db5acffe3f247cba86382a873cc1029b45ded)) + +* fix: better handling of groups containing groups in ssp gen and assemble (#977) + +* added test and json files + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final fixes of recursive group handling + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage and changed recurse to mean recurse within controls only + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`5fa1820`](https://github.com/oscal-compass/compliance-trestle/commit/5fa18203d89ff353f8500f892b85b957385ebb11)) + +* fix: several issues in profile assemble and catalog generate (#974) + +* fixed several bugs in profile and catalog + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* doc string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improved doc strings and cleaned up namings + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`0435c84`](https://github.com/oscal-compass/compliance-trestle/commit/0435c8405e4ff1b6608ec93fb3baafb61356d1d8)) + +* fix: fix json blocks in md so mdformat doesnt raise cannot format warning (#973) + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> ([`73b0612`](https://github.com/oscal-compass/compliance-trestle/commit/73b061275e101c19e34a45fa5ab959b1f29f6293)) + +* fix: add toml as yapf pre-commit dependency (#972) + +* fix: add toml as yapf pre-commit dependency + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* fix: Add yapf extra dependency + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> +Co-authored-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`d026282`](https://github.com/oscal-compass/compliance-trestle/commit/d0262826f30e0c7f89f8a3551b93142669fa2c66)) + +* fix: fix blind link in readme (#969) + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> +Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> ([`3f054bd`](https://github.com/oscal-compass/compliance-trestle/commit/3f054bd8d82032371955627023ceb257e2f3d4f6)) + +* fix: Handle error when dealing with profiles with no modify object. (#963) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`7ad3c82`](https://github.com/oscal-compass/compliance-trestle/commit/7ad3c82058991507808580e800f0bc9df16d2071)) + +### Unknown + +* Merge pull request #986 from IBM/develop + +chore: Trestle release ([`03ca23e`](https://github.com/oscal-compass/compliance-trestle/commit/03ca23eccf7d5086c47eeaf81a1fd8ef154d1861)) + +## v0.33.0 (2021-12-21) + +### Chore + +* chore: custom pruning for a smaller catalog but preserving controls ac-1 through -5 (#953) + +* feat: custom pruning for a smaller catalog but preserving controls ac-1 through ac-5. +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* added full controls and hooked into all existing tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Frank Suits <frankst@au1.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`4099d48`](https://github.com/oscal-compass/compliance-trestle/commit/4099d48e5e289367eed588bd70ff9d6f8d90ee35)) + +* chore: Merge back version tags and changelog into develop. ([`4db0a04`](https://github.com/oscal-compass/compliance-trestle/commit/4db0a047e290437ff09c7c54072494af15eef191)) + +### Feature + +* feat: Support for SSP writing with jinja templating. (#787) + +* chore: Committing to change priorities. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Demonstration of jinja extensions allowing processing of oscal fields. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Added example on jinja if tags + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: Add Jinja markdown filters + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: Adding jinja transform command + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Lazy stashing. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: updated signatures + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: Adding kwarg to allow jinja templates to adjust header level + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Add ssp io (#938) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Fix control response + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Corrected mdtags to use kwargs properly + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Adjust control response + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Remove extra test data + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Fix test name + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Small adjustment + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Working ssp templating + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: adding missing test files. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Print response for this system + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Minor edits + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: CICD Cleanups (#943) + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Adjust tables and headers (#944) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Correcting tables in ssp_io + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: fix attribute error in catalog_interface (#946) + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* chore: Fix tests and tables + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Add more tests + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Small fix + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: documentation for the jinja command. (#948) + +* fix: Added jinja cmd documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Revising docs based on PR feedback. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: More tests + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: add trailing newlines to md front_matter content (#956) + +fixes format issue in pandoc docx conversion of front matter, where the header of the following section is included in the previous paragraph if there is no trailing newline in the markdown file of the previous paragraph. + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* fix: Removed extra unnessary unit tests and unneeded code. (#959) + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Add Jinja (#958) + +* chore: Add jinja tests + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Address review feedback + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Address feedback + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Small fix + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Fix tests + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Small enchancement + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: update control title format for ssp output (#960) + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> + +Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> + +* chore: Adjust title in ssp + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Co-authored-by: Ekaterina Nikonova <enikonovad@gmail.com> +Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> +Co-authored-by: D9 <dougchivers@gmail.com> +Co-authored-by: Doug Chivers <doug.chivers@uk.ibm.com> ([`e47fc77`](https://github.com/oscal-compass/compliance-trestle/commit/e47fc778ab66a8997b689753ce5ead1849543e52)) + +### Fix + +* fix: merge dicts and remove transform command from CLI until mature.(#954) + +* initial changes to ssp docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* reworked merge and fixed tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixes for cidd-script + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`82e484b`](https://github.com/oscal-compass/compliance-trestle/commit/82e484b59a4415c2ece1fda55b2b7e9f1a46ab68)) + +### Unknown + +* Merge pull request #961 from IBM/develop + +chore: Trestle release ([`1874b18`](https://github.com/oscal-compass/compliance-trestle/commit/1874b1800d74f4997296b3343abdbe6d98a8ba6e)) + +## v0.32.1 (2021-12-17) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`0f808d1`](https://github.com/oscal-compass/compliance-trestle/commit/0f808d14e59d789dd0f634fab03a2a5a7f265d85)) + +### Fix + +* fix: cidd issues (#949) + +* fixed file encoding issue and changed signature of get_group_id + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added doc string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`038ca2e`](https://github.com/oscal-compass/compliance-trestle/commit/038ca2ec96a6d85aa891d0cf36e9f9c03e0733d7)) + +* fix: OSCO rules with prefix ocp- and dashes (#932) + +* fix: OSCO rules with prefix ocp- and dashes + +* Produce customized yaml based on "profile_check_version". + +* Simplify. + +* Fix code smell. + +* Add info note. + +* Expect metadata property profile_osco_version to customize emitted yaml. + +* Remove unnecessary typing. + +* Use non-empty href in profiles. + +* Simplify by using as_list function. + +* Simplify, use tuples. + +* Simplify, use tuples. (sneak in) + +* Emit description for OSCO version >= 0.1.40. + +* Several changes: + +- Remove flag profile_check_version. Always emit parameters if given. +- Don't add ocp4- prefix if its already there. +- Revise -i text accordingly. +- Revise unit tests accordingly. + +* Flag name "osco_version". + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`64f7a97`](https://github.com/oscal-compass/compliance-trestle/commit/64f7a973f5bb7c7946b789770034da186dbcd77e)) + +### Unknown + +* Merge pull request #957 from IBM/develop + +chore: Trestle Release ([`5bccc2c`](https://github.com/oscal-compass/compliance-trestle/commit/5bccc2cf8df53db5de00eabb57b518cf9f81025f)) + +## v0.32.0 (2021-12-14) + +### Chore + +* chore: Remove simulate from Plan (#916) + +* chore: Remove simulate + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Rollback changes + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`221471d`](https://github.com/oscal-compass/compliance-trestle/commit/221471d9773e26ddcb176ec24ef849325739c523)) + +* chore: Standarize return codes (#888) + +* chore: Standarize return codes + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Move exception catch + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Decrease test cov for now + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Adjust tests + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Remove exception coverage + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Increase coverage + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Increase coverage + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`6b376e3`](https://github.com/oscal-compass/compliance-trestle/commit/6b376e3e21875720ff91aaf4fef7d655d93a3514)) + +* chore: Merge back version tags and changelog into develop. ([`ccb0859`](https://github.com/oscal-compass/compliance-trestle/commit/ccb0859996ffbe6a9a2a589e8a98ef3de78f0faa)) + +### Documentation + +* docs: clear edit_uri to remove edit pencil (#937) + +* docs: clear edit_uri to remove edit pencil + +Closes: https://github.com/IBM/compliance-trestle/issues/529 + +Signed-off-by: Ryan Moats <rmoats@us.ibm.com> + +* fix: Removing incorrect flag in mkdocs.yml + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`e32c7ce`](https://github.com/oscal-compass/compliance-trestle/commit/e32c7ce46df3ff905e115ab315c36005f8e0e246)) + +* docs: add versioning tutorial (#917) + +* docs: add versioning tutorial + +Signed-off-by: Ryan Moats <rmoats@us.ibm.com> + +* Fix mkdocs yml mistake + +Signed-off-by: Ryan Moats <rmoats@us.ibm.com> + +* Remove default front matter + +Signed-off-by: Ryan Moats <rmoats@us.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b682806`](https://github.com/oscal-compass/compliance-trestle/commit/b682806f25783a8cc4df18647ac96973d365012d)) + +### Feature + +* feat: added documentation for fedramp plugin (#936) + +* feat: added documentation for fedramp plugin + +* fix: updated plugin docs + +Co-authored-by: Vikas <avikas@in.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`3deff2c`](https://github.com/oscal-compass/compliance-trestle/commit/3deff2c857c55348242e06a74f2647224517506c)) + +* feat: params in header for profile generate and assemble (#935) + +* writing profile params to header + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* clarified header_dont_merge behavior + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* profile assemble handles set_params in header + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed issue merging headers and added tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed issue with controls that just have statement + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed doc string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed typing + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed typing and doc string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix: Improved handling of line feeds in profile-assemble. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* numerous fixes + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed bugs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`a1b293f`](https://github.com/oscal-compass/compliance-trestle/commit/a1b293f8cac65d32b1cf21a22f49e02967f4e184)) + +* feat: tutorial cis-to-catalog (#931) + +* feat: tutorial cis-to-catalog + +* fix: removed unneeded escaped double quotes. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: removed unneeded escaped double quotes. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Added missing reference file. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`e2842a8`](https://github.com/oscal-compass/compliance-trestle/commit/e2842a8d66a261c98e973a7edf1bdddb2a342d06)) + +* feat: task cis-to-catalog (#911) + +* feat: task cis-to-catalog + +* Make code-format and code-lint happy. + +* Fix code smell: Exception + +* Fix code smell: ValuesView + +* Simplify class Node. + +* Oops, use pydantic BaseModel. + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`0a492d0`](https://github.com/oscal-compass/compliance-trestle/commit/0a492d01977467fb6839fbc83322149f5474bbe4)) + +* feat: roles in metadata (#926) + +* added function to get control param dict + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed special catalog group and use empty string instead + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added doc files + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed format + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`ddc1e66`](https://github.com/oscal-compass/compliance-trestle/commit/ddc1e662ef345eaecf5b5584964d5739f1c3ab43)) + +* feat: allow components in markdown and ssp assemble (#902) + +* adding support for header metadata + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added template + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* have bycomp working for ssp + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added doc files + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* made test less rigid + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* simplified test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* have components working properly with ssp assemble + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* handled pr feedback + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added tests and test files + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b03a236`](https://github.com/oscal-compass/compliance-trestle/commit/b03a236ad2928b384677e5777b1880d3386a4fe0)) + +* feat: Add ability to modify headers in the tree (#909) + +* feat: Add ability to modify headers in the tree + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Extra check + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Ensure tree identity + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Use better naming + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`b455c18`](https://github.com/oscal-compass/compliance-trestle/commit/b455c18c3492b7e4a4fced8b701780d109bed55e)) + +* feat: Altering ssp-generate to add all sections by default (#905) + +* feat: Altering ssp-generate to add all sections by default + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: adding extra test coverage. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`55a399b`](https://github.com/oscal-compass/compliance-trestle/commit/55a399bf129aa39e42e83e93e8b1b69aec20d9bb)) + +### Fix + +* fix: Fire off sonar only on local PRs. (#934) + +* fix: Fire off sonar only on local PRs. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Fire off sonar only on local PRs. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Update developer docs to explain sonar work around. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`26f4f0a`](https://github.com/oscal-compass/compliance-trestle/commit/26f4f0ab08af2d37c05130e3189bfa74f79b5a57)) + +* fix: Ensuring that mkdocs yaml both remains stable an is up to date. (#927) + +* fix: Correcting documentation website index. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correcting documentation website index such that it does not change again. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: adding check script to linter + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ee48763`](https://github.com/oscal-compass/compliance-trestle/commit/ee487634cbf80b3aeac12a7f103c19730b18e2da)) + +### Unknown + +* Merge pull request #942 from IBM/develop + +chore: Trestle release ([`57a5523`](https://github.com/oscal-compass/compliance-trestle/commit/57a55234b3d95a2b1a555333d250d77369ea96f2)) + +## v0.31.0 (2021-12-01) + +### Chore + +* chore: Increase test coverage for validation (#901) + +* feat: Add ignore files flag to the validation + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Ignore directories + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Update docs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Update tests + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Add deprecate warning + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* chore: Add missing tests for validation + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`0799c37`](https://github.com/oscal-compass/compliance-trestle/commit/0799c37b7d1a5c36535d0fa71c58e1bb2f73c863)) + +* chore: Merge back version tags and changelog into develop. ([`1cd9894`](https://github.com/oscal-compass/compliance-trestle/commit/1cd989494b5707d15a5b593987d8071a27ddd95d)) + +### Feature + +* feat: added trestle-fedramp project discovery and command (#899) + +* feat: added trestle-fedramp project discovery and command + +* fix: updated cli.py to add commands from plugins generically. Also added a CommandBase class to not check for trestle-root. + +* fix: Adding nocover statements. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Adding nocover statements. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Vikas <avikas@in.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`f0cc836`](https://github.com/oscal-compass/compliance-trestle/commit/f0cc8367a9001749a81c1a069f02ea00e49a7cec)) + +* feat: Ignore files from the validation (#898) + +* feat: Add ignore files flag to the validation + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Ignore directories + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Update docs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Update tests + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Add deprecate warning + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`c2af814`](https://github.com/oscal-compass/compliance-trestle/commit/c2af8148cd7698bc75803bec0c4d6b181e11cd64)) + +* feat: Enforce OSCAL version and notify user (#895) + +* feat: Enforce OSCAL version + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Print only version error if present + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Add safer version error check + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: gen oscal version (#900) + +* fixed validator for gen_oscal + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed comment typo + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`246875c`](https://github.com/oscal-compass/compliance-trestle/commit/246875ce0c7d42f931072739ae340b39bbb0399e)) + +* feat: sample generic oscal transform to filter ssp by profile (#820) + +* initial version of trestle transform + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* enhanced + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed dead code + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* increased coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added new arg for header + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* refined command options - tests pass + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improved docstrings + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* ssp assemble regenerate is working + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* clean up and boost coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed try block and added comments + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`afe243f`](https://github.com/oscal-compass/compliance-trestle/commit/afe243f6ece6fb9b361870e69b32d8d84a2e9335)) + +### Fix + +* fix: Remove empty folders (#904) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`552fb36`](https://github.com/oscal-compass/compliance-trestle/commit/552fb36a53198d9d1fcc06a0a3eb3cfe59b753b2)) + +* fix: tmp req init (#894) + +* fixed indent + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`e2d3ed0`](https://github.com/oscal-compass/compliance-trestle/commit/e2d3ed0f98a281ac5ef77edf5f4e90a0a09f53d8)) + +* fix: bad control causes uncaught exception in ssp-generate (#893) + +* fixed issue with bad control id + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added test profile + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improved multiline f string format + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`c50515a`](https://github.com/oscal-compass/compliance-trestle/commit/c50515a55452b776ed9397b62e658fb5d5b1d5b0)) + +* fix: Ignore subfolders in folders validation (#889) + +* fix: Fix template version for empty headers + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Ignore subfolders in folders + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Remove added line + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`727265a`](https://github.com/oscal-compass/compliance-trestle/commit/727265aebbcbdeffce5575c5907ba1fd000bdea3)) + +### Refactor + +* refactor: osco-to-oscal performance improvements. (#886) + +* Remove extraneous typing. + +* Remove osco_helper.py, consolidate into osco.py. + +* Oscal Result Factory. + +* Add checking flag. + +* Use monkeypatch. + +* Observation properties, without checking. + +* Remove more extraneous typing. + +* Correct return type of OscalResultsFactory.components. + +* Fix code smell. + +* Fix rule_use_generator return type. + +* Expunge pass statement (code smells). + +* 100% test coverage. + +* Fix presumed existence of "-". + +* Add cis-to-component-definition tutorial to mkdocs.yml ([`b3ae044`](https://github.com/oscal-compass/compliance-trestle/commit/b3ae044923935623ff162129e5ba5206e20ad23a)) + +### Unknown + +* Merge pull request #907 from IBM/develop + +chore: Trestle release - enabling plugin architecture ([`0865000`](https://github.com/oscal-compass/compliance-trestle/commit/08650008ffb5252c61d55eb2727825edb7d67889)) + +## v0.30.0 (2021-11-22) + +### Chore + +* chore: Trestle release + +chore: Trestle release ([`94e161b`](https://github.com/oscal-compass/compliance-trestle/commit/94e161b3ccde191b97361a3e5d37222ad04ff27b)) + +* chore: Merge back version tags and changelog into develop. ([`ab49b65`](https://github.com/oscal-compass/compliance-trestle/commit/ab49b65ddfe6e9b4d28abe0c796c62bacbaf717a)) + +### Feature + +* feat: OSCO transformer support for OpenScap 1.3.5 (#876) + +* feat: OSCO transformer support for OPenScap 1.3.5 + +* Use host_name as scc_inventory_item_id. + +* Fix code smell. + +* Use dict for passing args; use else clause when necessary. + +* Oops, signature typing issue. + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`dcfb34a`](https://github.com/oscal-compass/compliance-trestle/commit/dcfb34ae67ce0bf057d224a6eb4065e25d616a42)) + +## v0.29.0 (2021-11-19) + +### Chore + +* chore: Allowing multiple PR templates. (#873) + +* chore: UTesting multiple PR templates. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: UTesting multiple PR templates. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d34dc72`](https://github.com/oscal-compass/compliance-trestle/commit/d34dc7291aa5901f0751b69adf7437a5b85f468a)) + +* chore: Merge back version tags and changelog into develop. ([`aeae771`](https://github.com/oscal-compass/compliance-trestle/commit/aeae771e0e90c7c69ef914ca02d4857ed6f50222)) + +### Feature + +* feat: tutorial for task cis-to-component-definition (#870) + +* feat: tutorial for task cis-to-component-definition + +* reduce size of sample output. + +* mdformat + +* Remedies for reviewer comments. + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`4e4d6b4`](https://github.com/oscal-compass/compliance-trestle/commit/4e4d6b4ba600792ce5a6dfd3606fb730099cbdef)) + +* feat: Add support for ignored fields to header (#794) + +* feat: Add support for ignored fields to header + +Specific list: +- 'extra-fields' +- 'additional-approvers' + +Signed-off-by: Ryan Moats <rmoats@us.ibm.com> + +* Update added tests + +Conform to new directory structure + +Signed-off-by: Ryan Moats <rmoats@us.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`37e9b60`](https://github.com/oscal-compass/compliance-trestle/commit/37e9b60cecf6516c934fafa8fa969672ade8ef7f)) + +### Fix + +* fix: cat assemble label needs to load labels as properties when reading controls (#878) + +* load label as property when reading controls + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed invocations involving header_dont_merge + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* force prompt of additional content + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added test and more docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`0b97476`](https://github.com/oscal-compass/compliance-trestle/commit/0b97476db8bfbac4925b2af2ec1b8edda9178e33)) + +* fix: cleanup PR template. ([`f7c433b`](https://github.com/oscal-compass/compliance-trestle/commit/f7c433b8a4d86a39150e596e4e395b03a2dab984)) + +* fix: Current support for multiple PR templates is insufficient in Github. (#879) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`bf12f2e`](https://github.com/oscal-compass/compliance-trestle/commit/bf12f2e464adaf371ec2f7f63050395a05ec1cfb)) + +* fix: Updating documentation to exploit code highlighting. (#877) + +* fix: Updating documentation to exploit code highlighting. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Minor changes + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`10bd679`](https://github.com/oscal-compass/compliance-trestle/commit/10bd6792d8a9b9b42d26653fffd40baaad4d3251)) + +* fix: mangled merging of lists and lack of recursion in profile resolver (#869) + +* generalized recursive profile resolver + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tweaked docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added list item types + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* small cleanup + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* more simplification + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix: Ensure trackback logging occurs only on debug level. (#872) + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* final tweaks + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed unreachable code + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`e3ccbbc`](https://github.com/oscal-compass/compliance-trestle/commit/e3ccbbc4c6675264dcc245ed6c5e2454d04078c8)) + +* fix: Incorrect behaviour of lint PR. (#868) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e5209c3`](https://github.com/oscal-compass/compliance-trestle/commit/e5209c33f8d53bd022e410d52ef97d3316746023)) + +### Refactor + +* refactor: use monkeypatch to replace more mock library patch blocks (#874) + +* refactor(tests): migrated tests from unittest.mock to monkeypatch for assemble.py and command.py +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* refactor(tests): lint and format. +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* refactor(tests): migrated from unittest.mock to monkeypatch for docs_test.py +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* refactor(tests): migrated from unittest.mock to monkeypatch for folders_test.py +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* refactor(tests): migrated from unittest.mock to monkeypatch for task_test.py +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* refactor(tests): migrated from unittest.mock to monkeypatch for replicate_test.py +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> ([`256f5d4`](https://github.com/oscal-compass/compliance-trestle/commit/256f5d4fcd5a2f9193ee374a098565c64a71d2bf)) + +### Unknown + +* Merge pull request #880 from IBM/develop + +chore: Trestle release ([`c6b1bf8`](https://github.com/oscal-compass/compliance-trestle/commit/c6b1bf833b4d692b73546ee2d7c03a913c76cea6)) + +## v0.28.1 (2021-11-17) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`2704553`](https://github.com/oscal-compass/compliance-trestle/commit/2704553dda7b8f8daa9dbb6003084080871adbc3)) + +### Fix + +* fix: remove results {} from osco-to-oscal console display (#866) + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`d62051e`](https://github.com/oscal-compass/compliance-trestle/commit/d62051e0fb45c99edd97b0314117b7208dd11d91)) + +* fix: add spec.desctiption to produced yaml (#865) ([`b988684`](https://github.com/oscal-compass/compliance-trestle/commit/b988684ffb02011c4f890b8f889abb0c7184e03c)) + +### Unknown + +* Merge pull request #867 from IBM/develop + +fix: trestle release ([`b952390`](https://github.com/oscal-compass/compliance-trestle/commit/b952390f90a97eb60c60cd69b71f67431f5744c0)) + +## v0.28.0 (2021-11-16) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`60920c6`](https://github.com/oscal-compass/compliance-trestle/commit/60920c6da1bb2d10f56575ff9a4012887a176ab3)) + +### Fix + +* fix: Fix instance version (#862) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`56f7cdf`](https://github.com/oscal-compass/compliance-trestle/commit/56f7cdfe537adfcfcb8398df7d06b71cbf35781d)) + +### Unknown + +* Merge pull request #863 from IBM/develop + +fix: Trestle bug fix release. ([`9bcb217`](https://github.com/oscal-compass/compliance-trestle/commit/9bcb21787a71e67db1bf94f812aa0e3ba8260cfe)) + +## v0.27.2 (2021-11-16) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`c5480f5`](https://github.com/oscal-compass/compliance-trestle/commit/c5480f5d51c65c9066dabb347102dbc0a9b9a05d)) + +* chore: Merge back version tags and changelog into develop. ([`3ab740b`](https://github.com/oscal-compass/compliance-trestle/commit/3ab740ba766941e9ea93368b20458a7f26f21f24)) + +* chore: Merge back version tags and changelog into develop. ([`d546739`](https://github.com/oscal-compass/compliance-trestle/commit/d5467397cbfe0ccc66e6f5bfd783747e7751603e)) + +### Feature + +* feat: Add yaml header to various trestle author docs in a safe manner. (#853) + +* fix: Preserve yaml header ordering in markdown ssp workflows. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: Add safe yaml behaviour + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`0b6f8a1`](https://github.com/oscal-compass/compliance-trestle/commit/0b6f8a18d1de460c14fa36d107729e367682045e)) + +### Fix + +* fix: force trestle relesae. ([`49243e3`](https://github.com/oscal-compass/compliance-trestle/commit/49243e369120958536a644a4a063cf19f1870b7a)) + +* fix: Correcting mkdocs (#860) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`89a6d0d`](https://github.com/oscal-compass/compliance-trestle/commit/89a6d0dc42d87b7082ec4c1a2def684cc4ae543b)) + +* fix: Relabel yaml-safe to header-dont-merge. (#858) + +* fix: Relabel yaml-safe to header-merge. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: recommended changes to be backwards compatible. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`58e6b1d`](https://github.com/oscal-compass/compliance-trestle/commit/58e6b1d8bec4a5b210d47d24acaf2ea770a31000)) + +* fix: 2 bugs in task cis-to-component-definition (#856) + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`61da0b8`](https://github.com/oscal-compass/compliance-trestle/commit/61da0b89aaab4c15b0e4a2c885efbdf387b30d10)) + +* fix: Fix headers recurse flag (#849) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`d285cc6`](https://github.com/oscal-compass/compliance-trestle/commit/d285cc61ff52531d821c03ab4bcfdf4966b9c44e)) + +### Unknown + +* Trestle Release (#861) + +* fix: Fix headers recurse flag (#849) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Add yaml header to various trestle author docs in a safe manner. (#853) + +* fix: Preserve yaml header ordering in markdown ssp workflows. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: Add safe yaml behaviour + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: 2 bugs in task cis-to-component-definition (#856) + +Co-authored-by: Chris Butler <chris@thebutlers.me> + +* fix: Relabel yaml-safe to header-dont-merge. (#858) + +* fix: Relabel yaml-safe to header-merge. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: recommended changes to be backwards compatible. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correcting mkdocs (#860) + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: compliance-trestle-1 <84952801+compliance-trestle-1@users.noreply.github.com> +Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> +Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`c0d2901`](https://github.com/oscal-compass/compliance-trestle/commit/c0d29012b74d239d45e7e25ca841ebee3a2a09ec)) + +* Trestle release (#859) + +* fix: Fix headers recurse flag (#849) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Add yaml header to various trestle author docs in a safe manner. (#853) + +* fix: Preserve yaml header ordering in markdown ssp workflows. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: Add safe yaml behaviour + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: 2 bugs in task cis-to-component-definition (#856) + +Co-authored-by: Chris Butler <chris@thebutlers.me> + +* fix: Relabel yaml-safe to header-dont-merge. (#858) + +* fix: Relabel yaml-safe to header-merge. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: recommended changes to be backwards compatible. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: compliance-trestle-1 <84952801+compliance-trestle-1@users.noreply.github.com> +Co-authored-by: Ekaterina Nikonova <91102120+enikonovad@users.noreply.github.com> +Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`127e7ba`](https://github.com/oscal-compass/compliance-trestle/commit/127e7baf4688c505a6e51259af093823594c86b9)) + +## v0.27.1 (2021-11-15) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`8168c8c`](https://github.com/oscal-compass/compliance-trestle/commit/8168c8cf39c0cff989d34c5e983e3fbd7be9e469)) + +### Fix + +* fix: profile resolver issues with alter that has no adds (#847) + +* fixed issue with alter no adds + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`6865eb7`](https://github.com/oscal-compass/compliance-trestle/commit/6865eb7967ae954b14f5a10921d88ca567fae921)) + +### Unknown + +* Bug fix release + +Bug fix release ([`89fde8c`](https://github.com/oscal-compass/compliance-trestle/commit/89fde8ceee2b4eef9aec97a56f8b5e45f90711a7)) + +## v0.27.0 (2021-11-14) + +### Chore + +* chore: Correct CI triggering issues. ([`6d529dc`](https://github.com/oscal-compass/compliance-trestle/commit/6d529dc2d85845dedc78b5af809bc18f2f23cb51)) + +* chore: Adding docstrings automatically to all oscal models. (#827) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`0ff4dce`](https://github.com/oscal-compass/compliance-trestle/commit/0ff4dce660c0753c562b8d52eddcaa8ffd6bed98)) + +* chore: Remove baseexceptions (#826) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`69492ff`](https://github.com/oscal-compass/compliance-trestle/commit/69492ff292f1aa39fe6730552fa69821dbf70b41)) + +* chore: reduce lists in given input file and save into given output file (#807) + +* feat: recursively reduce lists in given input json file and save into given output file in json +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* feat: just one non-zero return code value of 1 for any exception +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* feat: last minute change in error, neglected to lint. +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* feat: lint again +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> ([`998cdee`](https://github.com/oscal-compass/compliance-trestle/commit/998cdee4bd3c816ee7a1d816948bc615f209d026)) + +* chore: Merge back version tags and changelog into develop. ([`8dc9934`](https://github.com/oscal-compass/compliance-trestle/commit/8dc99341f8512c8de1039b329067e6ee8448af17)) + +### Feature + +* feat: Add ability to use different versions of templates (#837) + +* feat: Add Template_Version to templates and instances + +Partially Closes: https://github.com/IBM/compliance-trestle/issues/761 + +Signed-off-by: Ryan Moats <rmoats@us.ibm.com> + +* Restructure to remove duplicate code + +Signed-off-by: Ryan Moats <rmoats@us.ibm.com> + +* Address Lint failures + +Signed-off-by: Ryan Moats <rmoats@us.ibm.com> + +* feat: Add template versioning + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Fix python version + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Refactor code + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Update docs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Switch logic to allow custom versions + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Allow validation of all versions + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Attempt to fix Windows issue + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Attempt to fix Windows issue + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Attempt to fix Windows hidden file + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: improved handling of hidden files in tests for windows (#846) + +* feat: facilitate improved performance within Tanium transformer. (#835) + +* Facilitate parallel processing to boost transform performance. + +* Add comments. + +* Multi-CPU testing fix. + +* monkey uuid.getnode() + +* lint. + +* Fix test uuid generation. + +* Another testing fix for UUID generation. + +* Monkey business. + +* Bypass multiprocessing for single batch. + +* add: temporary hack to test execute cpus, for windows. + +* Fix code smells. + +* Hack cpus test for now, since windows fails intermittently. + +* Unhack cpus test. + +* Lint. + +* Tidy up. + +* Update for 100% code coverage. + +* "huge" test case, config, and backup of "hack" solution. + +* fix: Tune property construction to reduce overhead + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Remove extraneous. + +* Fix transform time and batch size calculations. + +* Support checking and/or multiprocessing. + +* Typing fixes. + +* Delete re-named file. + +* Updates to address comments: + +- for loop +- type int +- large cpu values in test +- signature of __init__ + +* Fix comment re: OscalFactory. + +* Code smells fixes. + +* More code smells fixes. + +* Continue code smells fixing. + +* Test coverage 100% + +* fix: Minor signature changes + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Chris Butler <chris@thebutlers.me> + +* fixed handling of hidden files on windows + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improved docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: degenaro <lou.degenaro@gmail.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Ryan Moats <rmoats@us.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`c6d3618`](https://github.com/oscal-compass/compliance-trestle/commit/c6d3618f13e6dc945413867a8d102cd3a7c3c211)) + +* feat: facilitate improved performance within Tanium transformer. (#835) + +* Facilitate parallel processing to boost transform performance. + +* Add comments. + +* Multi-CPU testing fix. + +* monkey uuid.getnode() + +* lint. + +* Fix test uuid generation. + +* Another testing fix for UUID generation. + +* Monkey business. + +* Bypass multiprocessing for single batch. + +* add: temporary hack to test execute cpus, for windows. + +* Fix code smells. + +* Hack cpus test for now, since windows fails intermittently. + +* Unhack cpus test. + +* Lint. + +* Tidy up. + +* Update for 100% code coverage. + +* "huge" test case, config, and backup of "hack" solution. + +* fix: Tune property construction to reduce overhead + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Remove extraneous. + +* Fix transform time and batch size calculations. + +* Support checking and/or multiprocessing. + +* Typing fixes. + +* Delete re-named file. + +* Updates to address comments: + +- for loop +- type int +- large cpu values in test +- signature of __init__ + +* Fix comment re: OscalFactory. + +* Code smells fixes. + +* More code smells fixes. + +* Continue code smells fixing. + +* Test coverage 100% + +* fix: Minor signature changes + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`4d2ded4`](https://github.com/oscal-compass/compliance-trestle/commit/4d2ded49d314f6e632f531b08a58bc66d53d8997)) + +* feat: Significant json (de)serialisation performance improvements. (#841) + +* feat: Significant json performance improvements + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: Improved json IO performance + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Adding benchmarking scripts + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Add orjson for loading as well + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Remove now unused internal function + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Optimising opportunistic copy + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correct issues with conventional PR + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d6f3cb1`](https://github.com/oscal-compass/compliance-trestle/commit/d6f3cb1ab8113c997d463d832aa8c8b721faffd2)) + +* feat: add yaml header output for profile and catalog generate (#833) + +* added yaml header support + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* convert strings to const and boost coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`50093f0`](https://github.com/oscal-compass/compliance-trestle/commit/50093f075615fe25bb6e25b16ff5d98fb0a308f9)) + +* feat: Add ability to write modified drawio files (#813) + +* feat: Write modified drawio + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Use constants + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Keep old attributes and encoding + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Add docs + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`ea814bf`](https://github.com/oscal-compass/compliance-trestle/commit/ea814bfdcfb8e75e2812e182ec09b009e693312a)) + +* feat: build-component-definition (#788) + +* feat: build-component-definition + +* format + lint fix-up. + +* sonar fixes. + +* rename task as cis-to-component-definition, misc changes + 100% test cov + +* sunc + +* remove assert + +* fix code smell. + +* use https. + +* Remove t_<type> statements. + +* use monkeypatch. + +* Remove locally defined get_trestle_version(). + +* Remove properties. + +* Simplify ingestion of filtering rules json. + +* Use Path.open() + +* Revise fetch parameters map. + +* function parameter types. + +* coverage 100% + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`9f7b1fe`](https://github.com/oscal-compass/compliance-trestle/commit/9f7b1fec0efc017698ceef4c6bf77c132626ec93)) + +* feat: ssp filter allows filter of ssp based on profile (#805) + +* initial version of ssp filter + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* refactor and boost coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* cleaned up smells + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed model enum and converted strings to const + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* reworked the fs top_level_model access and cleaned up further + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final cleanup of const + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* optional on filecontent + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`494ba1b`](https://github.com/oscal-compass/compliance-trestle/commit/494ba1b9a749c44657365f45fc88a8c4aa94ed73)) + +* feat: Add centralised markdown API (#797) + +* feat: Add markdown api + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Fix test + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Small changes + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Handle html tags + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* Add documentation + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`8582516`](https://github.com/oscal-compass/compliance-trestle/commit/8582516f59a8258b513312185b8efdd4cb7a001e)) + +### Fix + +* fix: Preliminary fix for parameters where 'set parameter' is called an a value does not exist. (#823) + +* chore: Adding tests to verify behaviour parameter resolution + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Allow for cases where a"set parameter" is used without setting values + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Adding more complexity to tests to ensure coverage of the tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Initial implementation of imporoved props adding. Testing TBC. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Staging for Frank + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: remove dependency on bad logging behaviour. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: profile merge support (#828) + +* added support for merge methods in profile resolver + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added doc string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix: Small typo fixes + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correct small errors + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Segregate functions to reduce cognitive complexity. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Reduce cognitive complexity. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* extended support for profile_resolver + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix: Completing UT's and reducing code redudancy + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Added missing test files. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* better coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* increased coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addressed pr feedback + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix: Small formatting changes. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* profile param order sub works + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* trying to make constraints work + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* minor change to convert a warning to a debug msg + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* now using attrs for part components + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* changed default behavior in tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Co-authored-by: Frank Suits <frankst@au1.ibm.com> ([`d20f2b9`](https://github.com/oscal-compass/compliance-trestle/commit/d20f2b9e6ca10c4fa829bb723d68ea3d06902cd0)) + +* fix: merge yaml header content when writing control (#825) + +* now write catalog as markdown will check for yaml header contents + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added comments + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added coverage and docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed small bug in merge dicts + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* one more coverage line + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* another coverage line + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* small bug + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* error in tutorial text + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* final fix + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* clarified doc strings + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* test utils return bool instead of int + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`8d0b3b0`](https://github.com/oscal-compass/compliance-trestle/commit/8d0b3b0f3a6c5e3a47a42b46b77081a700947d6b)) + +* fix: all Alter/Add of prop by_id (#821) + +* allow add by_id + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added by_id prop to test file + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed unneeded catalog interface + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a9047a8`](https://github.com/oscal-compass/compliance-trestle/commit/a9047a83e0b0c64c34448f776a7e13fff77e6b2a)) + +* fix: ssp generate with alter props issue (#819) + +* fix for ssp generate + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* increase coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`a1e4219`](https://github.com/oscal-compass/compliance-trestle/commit/a1e421944ce11432b2b2832b8f669b65428f1b38)) + +* fix: Allow markdown substitutions (#812) + +* fix: Allow markdown substitutions + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Refactor code + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Fix typos + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`8d52d3e`](https://github.com/oscal-compass/compliance-trestle/commit/8d52d3eb4aaa0a73685983114ffa38c494b9fec4)) + +* fix: Handle hard line breaks (#804) + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`b1e39c1`](https://github.com/oscal-compass/compliance-trestle/commit/b1e39c1173b235a87981a2856081cd54aeac86e3)) + +### Unknown + +* Merge pull request #845 from IBM/develop + +Trestle release ([`7e8292d`](https://github.com/oscal-compass/compliance-trestle/commit/7e8292db889b8f1e3babf1e6327641b7e179b967)) + +## v0.26.0 (2021-10-20) + +### Chore + +* chore: Accomodate forked repos by separating sonarqube quality gate (#791) + +* chore: Accomodate forked repos by separting sonarqube quality gate + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Add triggers for remote branches + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore(cicd): Correcting CI yaml format. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Alter CI pipeline to use PR target, potentially avoiding issues for sonarqube + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ae95c25`](https://github.com/oscal-compass/compliance-trestle/commit/ae95c25dd1e3fec3c86ea34cd9981ddca65bf6d4)) + +* chore: Ensure sonar quality gate is measured (#775) + +* chore: Ensure sonar quality gate is measured + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Cleaning up badges + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Cleaning up PR template + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Clean up links + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correct image links + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ca25f93`](https://github.com/oscal-compass/compliance-trestle/commit/ca25f935749ef3dae804e98c82cee5cc4a587136)) + +* chore: Updated python directory. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`cbc451e`](https://github.com/oscal-compass/compliance-trestle/commit/cbc451e2c81eab0b9e509ff050b53e95d18bb85c)) + +* chore: Correct trestle sonar config. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`6bd8002`](https://github.com/oscal-compass/compliance-trestle/commit/6bd80026d10b9587ea086e8f41c76783959cac37)) + +* chore: Correct trestle sonar config. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`2c75f03`](https://github.com/oscal-compass/compliance-trestle/commit/2c75f03914d89e60b017e17eb0779eda85253a89)) + +* chore: Correct trestle sonar config. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9884eb6`](https://github.com/oscal-compass/compliance-trestle/commit/9884eb6c4c458432422d23e750e36e3220160a0a)) + +* chore: replace codecov with sonarcloud (#765) + +* chore: replace codecov + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Force clean coveralls install. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Force clean coveralls install. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correcting tokens + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Testing sonarcloud + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Update for SONAR to use coverage.xml + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Removing pcoveralls + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Adding sonar properties file. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Update sonar workflow. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Adding develop 'push' to ensure develop build is okay + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`1c41a04`](https://github.com/oscal-compass/compliance-trestle/commit/1c41a04bb7943f016e1148af6516da0d27fe9b9b)) + +* chore: Adding extra developer documentation (#763) + +* chore:Adding extra developer documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Adding extra developer documentation. + +* chore: Correcting typos + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`3242fc8`](https://github.com/oscal-compass/compliance-trestle/commit/3242fc85b9b66083b8d44fece2ce0c7349b741ce)) + +* chore: Merge back version tags and changelog into develop. ([`84c1b4d`](https://github.com/oscal-compass/compliance-trestle/commit/84c1b4d81fbecb639aa846773c1fa1fd4352bdf8)) + +### Feature + +* feat: Add exclusion flags to trestle author header validate to allow practical use without a task name. (#793) + +* fix: Adding more UTs + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: Adding exclude flag to trestle author headers. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Update test function names. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correct sonar gate which was not triggering + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correct sonar gate which was not triggering + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Resolve python 3.7 compatibility issues + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Cater to files w/o extensions + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d77408f`](https://github.com/oscal-compass/compliance-trestle/commit/d77408f39e914bff3dfc20ecf91e3a982a49bf4e)) + +* feat: allow author edits and update of profile (#771) + +* added control objective handling + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* objective seems ok + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* author profile works for prose + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added profile test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added test coverage for control_io + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* profile author now working + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* removed dead code + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* addressed pr changes and boosted coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* check moustaches + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* refined moustache work and improved excep handling + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docs for author profile and ssp tutorial + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* extra files + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tutorial edits and conversion to monkeypatch + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`650b6c9`](https://github.com/oscal-compass/compliance-trestle/commit/650b6c95eadfc68c5f0646761f57ac4b2542bb6c)) + +* feat: Improve profile resolver to cover "adds" scenarios in fedramp & NIST 800-53 (#766) + +* feat: Support additional adding positions in adds + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Change doc line + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Move validation to profile resolver + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* feat: Backout profile to original state + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`75911f3`](https://github.com/oscal-compass/compliance-trestle/commit/75911f3f88c6b4d9a4adaea03a77db7f9a83faf9)) + +* feat: author catalog to support reading and writing controls and catalogs (#734) + +* new catalog module + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* recurse the catalog + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improved format + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* more consistent format + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* refactored catalog interface and control writing + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* hooking in new methods + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* hooking in read controls + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* renamed some items + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* cleaned up control output + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added tests for control_io and now read/write controls + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* changes for statement and item + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* now test assembled catalog is equivalent + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boost coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* additional cleanup based on PR review + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed typo and clarified some code + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* multiple changes based on revision requests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* adjust md format and test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* remove test md files + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* small tweaks to md format + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`0a2bcea`](https://github.com/oscal-compass/compliance-trestle/commit/0a2bcea49841c774a667aeb9368e776402db23cf)) + +### Fix + +* fix: ssp issues (#795) + +* fixed small issues with ssp generate and assemble + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated comments + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* dont prompt for content if already there + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* prevent leading and trailing new lines in prose + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boosted coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`3532e4e`](https://github.com/oscal-compass/compliance-trestle/commit/3532e4ef7c7db33e6875a27123a4b6a4fa2655cc)) + +* fix: Further refinements to CI pipeline (#796) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`b46c63b`](https://github.com/oscal-compass/compliance-trestle/commit/b46c63be8a192993126b49c289e99ea5c10dc3a1)) + +* fix: Correct broken guards of sonarqube actions. ([`9e10c1e`](https://github.com/oscal-compass/compliance-trestle/commit/9e10c1e3fedc96c5f6e0b02651b77ce20d1421c5)) + +* fix: Add missing __init__.py, which can cause issues with pytest. (#792) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`bc6fbf3`](https://github.com/oscal-compass/compliance-trestle/commit/bc6fbf34843f3101edd4236f5dab904fa6a3606f)) + +* fix: Document submodule requirement for testing. (#782) + +* fix: Ensure git submodules are checked out when setting up a developers environment. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Updated develop docs w.r.t. submodules. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Updated develop docs w.r.t. submodules. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`3e711a3`](https://github.com/oscal-compass/compliance-trestle/commit/3e711a3416e8155a0e082b65e89060ac3e9d3227)) + +* fix: Resolve bugs in xlsx to component definition (#772) + +* fix: 2 bugs + +- print_info attempts to get non-existent data +- missing comma for correct alphabet specification + +* Employ more pythonic way of iterating through lower case alphabet. + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`ebff124`](https://github.com/oscal-compass/compliance-trestle/commit/ebff1247b5bc9abf615f10ae943b0fdff3644507)) + +* fix: Remove two bugs generated from unraised exceptions. (#777) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`5f698a6`](https://github.com/oscal-compass/compliance-trestle/commit/5f698a6c28c84a9eb9595ddd1248ce29f149895a)) + +* fix: Remove use of http aligning with zero trust principles. (#770) + +* fix: Remove use of http aligning with zero trust principles. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:correct typo + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Exclude OSCAL automatically generated code from duplication metrics. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`5b0240c`](https://github.com/oscal-compass/compliance-trestle/commit/5b0240cfa83f89d5182e04efa91feb4eb06ad8fd)) + +* fix(security): Remove user name from logs (#767) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`4d075b8`](https://github.com/oscal-compass/compliance-trestle/commit/4d075b89776552a1f58751674e2056ac7afac3cc)) + +* fix(cli): Correctly capture return codes (#760) + +* fix(conftest): Correctly capture return codes (#745). + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* fix(cli): Correctly capture return codes. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> ([`170d911`](https://github.com/oscal-compass/compliance-trestle/commit/170d9117dc318e39fa43249e424dcf244614ff1a)) + +* fix: Added more checks for pylint. (#758) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`2443ced`](https://github.com/oscal-compass/compliance-trestle/commit/2443cedf0ad7f7357aa4a1606fe7ddc8f6f3830b)) + +* fix: Adding automated tests of binary distribution validate release. (#756) + +* fix: Adding automated tests of binary distribution to ensure final release passes all tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Add python tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Correct yaml indentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: adding extra checks for pre-commit + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Add check for yaml files syntax + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correct issues with docstrings. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Corrected mdformat issues + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Changing PR check names to be cleaner + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`c0b6748`](https://github.com/oscal-compass/compliance-trestle/commit/c0b67485cd6e5619bbe4654d651931ce378315ca)) + +* fix: Ignore hidden files throughout the project (#755) + +* fix: Ignore hidden files throughout the project + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Add additional test + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Adopt tests for Windows + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* fix: Remove test cleaning + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> ([`aec1df4`](https://github.com/oscal-compass/compliance-trestle/commit/aec1df4e80168998a368d951861e62b502ca7fae)) + +### Refactor + +* refactor: Refactor replicate command to use CLI choices (#753) + +* refactor: Refactor replicate command to use CLI choices + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +* refactor: Comply with code formatting + +Signed-off-by: Ekaterina Nikonova <enikonovad@gmail.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`1c0a5fe`](https://github.com/oscal-compass/compliance-trestle/commit/1c0a5fef09f28e2fd663dcb3cb33e50396f0a27d)) + +### Unknown + +* Merge pull request #800 from IBM/develop + +Trestle release ([`bc908f4`](https://github.com/oscal-compass/compliance-trestle/commit/bc908f41c688cfb530724439c68865a58397e00b)) + +* Create codeql-analysis.yml ([`2e73916`](https://github.com/oscal-compass/compliance-trestle/commit/2e73916730a0bac9f6a49b77d520785be28680b6)) + +## v0.25.1 (2021-09-30) + +### Chore + +* chore: Trestle release ([`e420bc5`](https://github.com/oscal-compass/compliance-trestle/commit/e420bc5fab4c0dcbf28ffdd1b57cf4e69069a3c0)) + +* chore: Merge back version tags and changelog into develop. ([`5f7c07d`](https://github.com/oscal-compass/compliance-trestle/commit/5f7c07d7379fc6c63e332397889aa2c376bcdad2)) + +### Fix + +* fix: Emergency fix for trestle packaging. (#751) + +* fix: Emergency fix for trestle packaging. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: move install_requeest back into the correct setup.cfg section. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`8fedeaa`](https://github.com/oscal-compass/compliance-trestle/commit/8fedeaa641e7817fb4092224a315e1a38166078e)) + +## v0.25.0 (2021-09-29) + +### Chore + +* chore: trestle release + +chore: trestle release ([`f76a2d1`](https://github.com/oscal-compass/compliance-trestle/commit/f76a2d1944e02a74cc782fa1c6812df66ce45422)) + +* chore: Merge back version tags and changelog into develop. ([`e6dd0d7`](https://github.com/oscal-compass/compliance-trestle/commit/e6dd0d7b94ba7581800bb10304d973ffe5e7d0bf)) + +### Feature + +* feat: osco results remove scc_goal_description (#736) + +- remove scc_goal_description class (but keep benchmark_id property) +- use result id rather than benchmark.id for scc_predefined_profile +class +- fix corresponding expected test outputs +- reduce size of rhel7 expected test output + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`f687a3d`](https://github.com/oscal-compass/compliance-trestle/commit/f687a3dcc44590a60f777d38eafe4013d54909e6)) + +### Fix + +* fix: Ensure a minimimal code base is delivered via pypi (#741) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`03557bd`](https://github.com/oscal-compass/compliance-trestle/commit/03557bdd44980899342665bac2d1905489981a75)) + +* fix: Adding extra documentation for element path. (#735) + +* fix: Add extra documenntation for element path + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Correcting typos. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`bc32371`](https://github.com/oscal-compass/compliance-trestle/commit/bc32371e3f81adab5cd4621055421f2acb05c566)) + +* fix: Test files to confirm and close issues (#732) + +* fix: Adding extra test files. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Updated code docs. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correct packages + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e87eb84`](https://github.com/oscal-compass/compliance-trestle/commit/e87eb84aabffd842275a673e63e42c75bd418203)) + +### Refactor + +* refactor: use monkeypatch to replace mock library patch blocks (#739) + +* chore(tests): replace mock patching with monkeypatch(ing) instead. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(tests): linted and formatted. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(tests): One monkeypatch switch for cache_test.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(cache_test): with patch (unittest) blocks replaced with monkeypatch in cache_test.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(conftest): monkeypatch switched for unittest patch block in conftest.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(split_test): monkeypatch instead of unittest patch block in split_test.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(validate_test): monkeypatch instead of unittest 'with patch' blocks in validate_test.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(init_test): monkeypatch instead of unittest 'with patch' blocks in init_test.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(href_test): monkeypatch instead of unittest 'with patch' blocks in href_test.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(version_test): monkeypatch instead of unittest 'with patch' block in version_test.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(import__test): monkeypatch instead of unittest 'with patch' blocks in import__test.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(main_test): monkeypatch instead of unittest 'with patch' block in main_test.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(cli_test): monkeypatch instead of unittest 'with patch' block in cli_test.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* chore(test_utils): monkeypatch instead of unittest 'with patch' block in test_utils.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* Revert "chore(test_utils): monkeypatch instead of unittest 'with patch' block in test_utils.py." + +This reverts commit a99ad81a143f43b0c656d8975fa9c670d75b9b46. + +Explanation: + The changes being reverted really just makes the code look nicer for one 'with patch' block. +If this is indeed replaced with monkeypatch, with the latter as an art for the create_trestle_project_with_model() +function, then all calls to create_trestle_project_with_model() will need refactoring to include a MonkeyPatch +argument. This does not seem worth it, so reverting. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* refactor(tests): monkeypatch instead of unittest 'with patch' block in test_utils.py and, being affected, split_test.py. + +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`88a4f3c`](https://github.com/oscal-compass/compliance-trestle/commit/88a4f3ccc08778deb3596c06203bd139048af25f)) + +## v0.24.0 (2021-09-21) + +### Chore + +* chore: add link to compliance-trestle demos in main README.md. (#722) ([`cbf9524`](https://github.com/oscal-compass/compliance-trestle/commit/cbf95247dcba5731221db22393a67beff3c92770)) + +* chore: Merge back version tags and changelog into develop. ([`e8a7b82`](https://github.com/oscal-compass/compliance-trestle/commit/e8a7b82befcfe4a95e6e8d42a4829c03d050e3ee)) + +### Feature + +* feat: Allow import to use the caching functionality to access external URLs (https/sftp etc) (#718) + +* import now via cache + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* some cleanup + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* import now uses cache and can work with relative paths. + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* remove sftp:// from fetcher uri test causing failure cicd + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* localizing test failure in cicd + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added try clause for urlparse + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix: Refactored test to use parametrize + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* removed ftp case + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* blocked off bad uri tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added tests back in + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* disallow : in local files for unix + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tweaked slashes for unix + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tutorial import via url and add windows encoding + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed encoding issue on write in cache + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixes made based on PR feedback + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`3527259`](https://github.com/oscal-compass/compliance-trestle/commit/352725952687fde4627c97037e68f2238c638a04)) + +### Fix + +* fix: Update OCP compliance operator transform to use classes expected by IBM SCC. ([`2068f57`](https://github.com/oscal-compass/compliance-trestle/commit/2068f570ff6d47bb0348e630cd4dc01e2d90e4b5)) + +* fix: Correct split merge pathing inconsistencies. (#725) + +* fix: Corrections to fix merge + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Update tests for drawio functionality. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Initial set of tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Initial set of tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Temp patch for testing + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: update changes to fix merge to clean up functionality. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correct validator behaviour + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correcting doctags + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correcting doctags + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Updated comments / errors. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Updated comments / errors. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`1ea7f63`](https://github.com/oscal-compass/compliance-trestle/commit/1ea7f63549ad1f74a47572fb00f04f42bce2e5ab)) + +* fix: Correct merge (including repository functionality) and improve merge cwd handling. (#724) + +* fix: Corrections to fix merge + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Update tests for drawio functionality. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a780e2c`](https://github.com/oscal-compass/compliance-trestle/commit/a780e2ca16f8e5ca99a74e8167b6ccb66c3e91e1)) + +### Unknown + +* Merge pull request #729 from IBM/develop + +chore(release): Bug fixes and enabling caching for import ([`1f1598e`](https://github.com/oscal-compass/compliance-trestle/commit/1f1598eae114e4b6223cc09e162ad770dfd7bf69)) + +## v0.23.0 (2021-09-03) + +### Chore + +* chore: regen oscal with new datamodel-codegen and make develop (#714) + +* re run gen-oscal after make develop + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added comment + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`60973b8`](https://github.com/oscal-compass/compliance-trestle/commit/60973b8134cbd724763c5b3b14dc7e2c28f1f9c2)) + +* chore: Clean up issue templates. (#707) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9f6db2d`](https://github.com/oscal-compass/compliance-trestle/commit/9f6db2daf3cbe942bbf5133ff03e450bd5c42f75)) + +* chore: Merge back version tags and changelog into develop. ([`7a994f3`](https://github.com/oscal-compass/compliance-trestle/commit/7a994f31d8113403bf5b3ab750a1b1659d6318ae)) + +### Feature + +* feat: Update of Oscal profile to osco from initial PoC with stakeholder review. + +* feat/oscal-profile-to-osco-yaml-rev2 + +* Comments. + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`c47092a`](https://github.com/oscal-compass/compliance-trestle/commit/c47092aecf0d4b73eef2147738832748ecb04b1a)) + +* feat: resolved profile catalog functionality and enhanced ssp generation (#694) + +* initial changes prior to pull. + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* now creating basic resolved profile catalog + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* now prune controls + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* clean up a bit + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix: Documentation fixes as well as fixes to json serializisation for full utf-8 support. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* now good except for unicode + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* ssp now matches, added warning for odd files during validate + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tweak validate + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tidy ssp + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* initial pipeline for generating resolved catalog + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* cascaded profiles do correct selection + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* modify mostly working + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* all seems ok + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* all tests pass + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* ssp generation looks good + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* Typo + +* added more recursion + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed sections being dropped + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* clarify part text for ssp assemble + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* ssp now doesnt overwrite + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* increase coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix: Corrected issues from inconsistent versions of mdformat including in the CI pipeline. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* added complex profile with depth + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added test profile c + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tweaked doc text + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* clean up ssp a bit + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* chore: Fixing code formatting after merge conflict. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* addressed review requests. + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* typing generators as iterators + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`193e3b9`](https://github.com/oscal-compass/compliance-trestle/commit/193e3b9e8179d3be0b5eaa4692e9106c5e4ad628)) + +* feat: Add new OSCAL profile-to-osco-yaml transformer functionality. (#677) + +* OSCAL profile to osco yaml transformer + +* Fix unit test description. + +* Fix import of text_files_equal. + +* Address reviewer suggestions and other improvements + +- change default output filename to osco-profile.yaml +- fix interface types +- fix incorrect comments +- return json string, not dict +- set new or default values on class creation +- reduce size of test data + +* fix: Updated href to the nist 800-53 catalog. + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`c7e2156`](https://github.com/oscal-compass/compliance-trestle/commit/c7e2156b9cc2546d15a70e7699091465c8a54e91)) + +* feat: Adding rich model generation to trestle add and trestle create. (#693) + +* feat: Adding optional argument to allow richer model generation to trestle add and trestle create + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Refactoring more tests to take advantage of monkeypatch. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Improved tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Extra unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Improved documentation. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correct md issues. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9d32953`](https://github.com/oscal-compass/compliance-trestle/commit/9d329530893da01de1b71dce8711fa3edb1fc2cb)) + +* feat: Adding capability to allowing generator to generate optional fields. (#690) + +* feat: Adding capability to allow gOscal Generator to generate optional fields + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Clean up arguments. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Clean up arguments. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`4a0f631`](https://github.com/oscal-compass/compliance-trestle/commit/4a0f6318b426e24a2764e0a75edcaa84861cadd8)) + +### Fix + +* fix: Refactor underlying methods to isolate calls to Path.cwd() (#716) + +* fix: Refactor underlying methods to isolate calls to cwd + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Cleaned up unit tests and command docstrings. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Cleaned up unit tests and command docstrings. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Further code clean up. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`473c1d8`](https://github.com/oscal-compass/compliance-trestle/commit/473c1d8ca85e688bd75362a3f0f22e8cc81c327d)) + +* fix: Cleanup assemble command to reduce LoC covering the same functionality. (#709) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`c40cfca`](https://github.com/oscal-compass/compliance-trestle/commit/c40cfca85af92c6e5d6c725ea069db4d534676f9)) + +### Unknown + +* Merge pull request #717 from IBM/develop + +feat: Trestle release ([`e0aacad`](https://github.com/oscal-compass/compliance-trestle/commit/e0aacadc3706f86ad86fd27c7df26a2e2b2425ec)) + +## v0.22.1 (2021-08-19) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`639a9c1`](https://github.com/oscal-compass/compliance-trestle/commit/639a9c1fdbc7257457065d753beed8ac82fe0486)) + +### Fix + +* fix: Strip back dependencies due to dependency error (#684) + +* fix: Updating developer docs on CI workflow + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Additional documentation details + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: removed dependencies that are causing conflicts. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: removed dependencies that are causing conflicts. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a8b4768`](https://github.com/oscal-compass/compliance-trestle/commit/a8b476859cbc3ba77f9bf389ed2bb977bd80c592)) + +* fix: Updating developer docs to include details on the CI workflow. (#683) + +* fix: Updating developer docs on CI workflow + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Additional documentation details + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e8d63e1`](https://github.com/oscal-compass/compliance-trestle/commit/e8d63e1ddcfb9bf1b179de195bb86b7af7758fe3)) + +### Unknown + +* Merge pull request #686 from IBM/develop + +fix: Trestle release ([`8d76b52`](https://github.com/oscal-compass/compliance-trestle/commit/8d76b5259782f7a8782df3491c391cc77472220b)) + +## v0.22.0 (2021-08-13) + +### Chore + +* chore: Merge pull request #679 from IBM/develop + +feat: Trestle release ([`6582a5c`](https://github.com/oscal-compass/compliance-trestle/commit/6582a5cb20ff092763beb5059fbb8c34dd712b79)) + +* chore: Adding google analytics to website (#680) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`4375ab9`](https://github.com/oscal-compass/compliance-trestle/commit/4375ab92fca03a699cdd788c0bfe01b9a60a45c0)) + +* chore: Merge back version tags and changelog into develop. ([`1ba9815`](https://github.com/oscal-compass/compliance-trestle/commit/1ba9815b75b82ee04acffbea4c1532fdd0f1feb4)) + +### Feature + +* feat: Schema validate command including miscellaneous fixes. (#665) + +* chore: Initial skeleton + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Clean up of text_files_equal (#664) + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Working on unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Complete basic Unit tests + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Cleaning up code. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Removing target model from scope + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: adding testing. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Added remaining unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Adding the missing files. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Added extra documentation. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Addressed issues in review + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Adding more unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`3ab088a`](https://github.com/oscal-compass/compliance-trestle/commit/3ab088a9a9b4927a660510fe6fe8438a9b48fdfa)) + +* feat: new command href and now ssp gen uses caching to pull catalog from remote (#669) + +* first reworking of cache. tests pass + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* have expiration working. + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added test + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* improved uri handling and tests + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added new command href + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* ssp gen works via cache + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* increased coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix unix test failures + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* more href tests and fixes based on pr feedback + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boost coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix docstrings + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* windows drive path issue + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docs for href and now dont cache local hrefs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated cli.md + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated href text 3 + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed changes to pre-commit for mdformat + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fix: Correct missing/bad mdformatted documents and add mdformat to pre-commit. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`660ef47`](https://github.com/oscal-compass/compliance-trestle/commit/660ef47b48d17ce19ab31690ef8264afb085e326)) + +### Fix + +* fix: Improved error handling of yaml headers in markdown files. (#676) + +* chore: Initial skeleton + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Clean up of text_files_equal (#664) + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Working on unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Complete basic Unit tests + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Cleaning up code. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Removing target model from scope + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: adding testing. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Added remaining unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Adding the missing files. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Added extra documentation. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Addressed issues in review + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Improved error handling of yaml header. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Adding more unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Covering bad yaml headers with testing. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Covering bad yaml headers with testing. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Bad md header. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`1983925`](https://github.com/oscal-compass/compliance-trestle/commit/198392543a864ab213d869ddeaa123817d69b3c2)) + +* fix: Documentation fixes as well as fixes to json serializisation for full utf-8 support. (#674) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d051638`](https://github.com/oscal-compass/compliance-trestle/commit/d0516381a8be4d4c97c14395965ade00f8181083)) + +* fix: relocate ParameterHelper class. (#667) + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`0dbf472`](https://github.com/oscal-compass/compliance-trestle/commit/0dbf472c5d3513fb85d66e4f76bb3bc037fc726f)) + +* fix: file compare issue in task xlsx-to-component-definition unit test (#666) + +* Fix file compare issue in task xlsx-to-component-definition unit test + +trestle version increases with each release, which affects the produced +output but not in any material way with respect to the unit tests at +hand. + +fix is to employ local function to get_trestle version which nominally +returns the actual trestle version, but to mock said function in the +unit test. + +* fix: file compare issue in task xlsx-to-component-definition unit test + +* Use trestle version 0.21.0 in compare data, same as parameter-helper +fix. ([`052d184`](https://github.com/oscal-compass/compliance-trestle/commit/052d184a1cb5b83e034e7f2bc7c8a240299f7b6e)) + +## v0.21.0 (2021-07-30) + +### Chore + +* chore: Further improvements to testing performance (#662) + +* chore: Improving testing performance in CICD + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Further scleaning of CICD to optimise performance + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Further scleaning of CICD to optimise performance + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e281fa9`](https://github.com/oscal-compass/compliance-trestle/commit/e281fa936fbd232e36825e4609585c4e669f6ca7)) + +* chore: Improving testing performance for the CICD pipeline(#661) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`83abe2d`](https://github.com/oscal-compass/compliance-trestle/commit/83abe2dd8a74c818cfac5e45b4e2900cb609c423)) + +* chore: Merge back version tags and changelog into develop. ([`4e1bb9f`](https://github.com/oscal-compass/compliance-trestle/commit/4e1bb9fee0ccc67f2be27693eb28b3707e1fe888)) + +### Documentation + +* docs: Cross link documentation between compliance-trestle and compliance-trestle-demos repositories. (#637) + +* feat: Added demonstration content. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Cleaned up demo content. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Removed dupicate demos. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`f28aca1`](https://github.com/oscal-compass/compliance-trestle/commit/f28aca1073888a7575a277c819449302e8e52b23)) + +### Feature + +* feat: Trestle Release #659 from IBM/develop + +feat: Trestle release ([`6329c82`](https://github.com/oscal-compass/compliance-trestle/commit/6329c82ddd59e2699bd6e7dc8cd571e948fa21f6)) + +* feat: describe command to describe contents of model files with optional element path (#650) + +* added describe.py file + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* initial describe parsing + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* describe mostly working + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added comments + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added test file + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added typing for docstrings + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* more docstring fixes + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boost coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* wrong test docstring + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* more tests and enhancements + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* initial documentation for describe + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* updated docs for split and describe + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added new md doc files + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* check for commas and added to docs for describe + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`905ff8a`](https://github.com/oscal-compass/compliance-trestle/commit/905ff8ac3cb0c7f11a8d8601bbcbcb2f9b40cae0)) + +* feat: spread sheet to component definition (#635) + +* spread sheet to OSCAL component definition task + +* spread sheet to OSCAL component definition task + +* Merge with develop, minor fixes. + +* Add missing column specs to -i output. + +* Relocate references to IBM and SCC from code to config. + +* Remove hard-coded NIST values, relocate to config file. + +* Use from trestle.utils.fs import text_files_equal + +* Fix flake8. + +* Remove the copy of the nist 800-53 catalog. + +* Remove the copy of the nist 800-53 catalog. + +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> + +* flake8, but no complaint on my laptop? + +* Fix bare except. + +* Fix bare except. + +Signed-off-by: Lou DeGenaro <lou.degenaro@gmail.com> + +* linter fixes. + +* linter fixes. + +* Reduce size of main execute function. + +Size of for loop reduced to 28 lines, including comments. +Minor bug fix in output catalog. + +* Fix test spreadsheets. + +- remove hidden and unused columns +- delete ods file + +* To identify column use heading (row 1) rather than letter. + +* Cosmetic fix to doc (for tanium-to-oscal). + +* Remove unused column and between blank columns from "good" spread sheet. + +Also, remove corresponding heading check from code. + +* Document trestle task xlsx-to-oscal-component-definition. ([`6fe4e22`](https://github.com/oscal-compass/compliance-trestle/commit/6fe4e22ce9235e95ccd73c836bc8cbedfa99799c)) + +### Fix + +* fix: ssp dropping section prose when in profile, now supporting profile & catalog section prose. (#657) + +* fixed section issue in ssps + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added docs + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* boost coverage + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`4eadf47`](https://github.com/oscal-compass/compliance-trestle/commit/4eadf475dc0ccd0f38bd365b9b71be90e6f98cce)) + +* fix: ssp section generation failed due to changes due to 1.0.0 (#649) + +* fixed ssp section generation - changes due to 1.0.0 + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* tweaked doc string + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`26dac34`](https://github.com/oscal-compass/compliance-trestle/commit/26dac345c65a59ef49f49af11dbacb1f2094ceb4)) + +* fix: split bugs and make -f optional (#639) + +* split working except for parent issue + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* split working - needs cleanup + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* cleaned up and fixed compdef props issue + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* fixed rel path split issue + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* renamed respository refs + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* start split with no -f + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* split with no file works + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* updated docs + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* boost coverage + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* fix lint issue + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* made requested changes from pr feedback. + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed split issues with new repository + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* converted TLO to TopLevelOscalModel + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* fixed extra variable assignment + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +* added try/except for test chdir + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> ([`c514301`](https://github.com/oscal-compass/compliance-trestle/commit/c51430175117e1c1071442d3c564fae4afcef461)) + +* fix: Cleanup and enhancement of linting. (#636) + +* fix: Improved linting + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Improved linting + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`631eba9`](https://github.com/oscal-compass/compliance-trestle/commit/631eba9ac1795bfcd109ed0e840898c2e6101528)) + +## v0.20.0 (2021-07-16) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`7656043`](https://github.com/oscal-compass/compliance-trestle/commit/7656043d4311f909b2fc3fa82ffe1d930a36c787)) + +### Feature + +* feat: Adding a global option to trestle author headers. (#628) + +* feat: Adding a global option to trestle author headers. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Added some unit tests for trestle author. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Added tests for missing coverage. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Updated docs. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`16f0265`](https://github.com/oscal-compass/compliance-trestle/commit/16f0265b1296066a203a5f844d89fd642a00fdb6)) + +* feat: Repository APIs to allow developer a consistent interface to a trestle repo. (#583) + +* Added Repo APIs and set trestle root in main command + +* implementing read for managedOSCAL + +* fix init validation in commad_docs + +* fix: Restructured command inherhitence to ensure trestle-root is found. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Completed ManagedOSCAL class implementation + +* removed __main__ from trestle_repo + +* Updated tests for trestle_root + +* Moved trestle_repo.ps to trestle/core/repository.py ans some other cleanup + +* Update fs.py + +Small typo error. + +Co-authored-by: Vikas <avikas@in.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`7bfabc5`](https://github.com/oscal-compass/compliance-trestle/commit/7bfabc5a9e078cbfb6b190d3ccb7f06942d9ea37)) + +### Fix + +* fix: Added test cases for Repository code (#625) + +* Added test cases for Repository code + +* updated comment + +* added more test cases + +* updated tests + +* updated test + +* updated repository split code and tests + +Co-authored-by: Vikas <avikas@in.ibm.com> ([`c3f8a33`](https://github.com/oscal-compass/compliance-trestle/commit/c3f8a339bb66ea4723c9b1fa7b7ef30edf275cb5)) + +* fix: split catalog star, enable split of model with wildcard (#626) + +* split nearly working + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* split star seems ok + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* boosted coverage - split star seems fine + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* cleaned up, about to pull develop + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* added doc + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* fixed error in docstring + +Signed-off-by: fsuits <frankst@au1.ibm.com> ([`d17389e`](https://github.com/oscal-compass/compliance-trestle/commit/d17389e824ce8f33f2a091cd541622fb40513a37)) + +* fix: tutorial tweaks (#623) + +* added editing of files in test of ssp assemble + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* improved handling of prose for implementations in ssp assemble + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* boost coverage + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* tweaks to the tutorial + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* explicit download of catalog file from nist github. + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* fixed backslash + +Signed-off-by: fsuits <frankst@au1.ibm.com> ([`3ab018d`](https://github.com/oscal-compass/compliance-trestle/commit/3ab018d6dd63ae4ee98d90daca9b5580687ac8ae)) + +* fix: Add gfm support for mdformat (#620) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`f67a74c`](https://github.com/oscal-compass/compliance-trestle/commit/f67a74c63aedd1cabdb6fcfd8f5be99b25886949)) + +* fix: ssp assemble prose, all extraction of general prose for responses (#618) + +* added editing of files in test of ssp assemble + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* improved handling of prose for implementations in ssp assemble + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* boost coverage + +Signed-off-by: fsuits <frankst@au1.ibm.com> ([`06e8627`](https://github.com/oscal-compass/compliance-trestle/commit/06e862705bbf3880678324ba29e4be54e54322e6)) + +* fix: boost coverage fix split_too_fine (#615) + +* improved test coverage, fixed split_too_fine, removed dict queries that arent needed + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* removed exception check in validate + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* reworked split_too_fine to deal with pydantic collection classes + +Signed-off-by: fsuits <frankst@au1.ibm.com> + +* improved typing and simplified multiple ifs to try except + +Signed-off-by: fsuits <frankst@au1.ibm.com> ([`891227b`](https://github.com/oscal-compass/compliance-trestle/commit/891227b9899b38f7ce609f8b4b715740cb9a84f7)) + +### Unknown + +* Merge pull request #629 from IBM/develop + +feat: Release of trestle repository functionality ([`4135275`](https://github.com/oscal-compass/compliance-trestle/commit/4135275e0874d1a5107e5494075c7ef4bae2d9f7)) + +## v0.19.0 (2021-07-06) + +### Chore + +* chore: [ImgBot] Optimize images (#609) + +*Total -- 343.57kb -> 285.47kb (16.91%) + +/3rd-party-schema-documents/IBM_assessment_result_interchange_SCC/Unification-SCC-class-for-OSCO-and-Tanium-to-OSCAL.png -- 171.79kb -> 142.74kb (16.91%) +/docs/reference/Unification-SCC-class-for-OSCO-and-Tanium-to-OSCAL.png -- 171.79kb -> 142.74kb (16.91%) + +Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com> + +Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> ([`d6f5148`](https://github.com/oscal-compass/compliance-trestle/commit/d6f514882934b895d4f1c3b22cf1d5e63288d95f)) + +* chore: Merge back version tags and changelog into develop. ([`18d4d38`](https://github.com/oscal-compass/compliance-trestle/commit/18d4d385dd1a4ba743a59811d199ab7dd1109820)) + +### Feature + +* feat: Merge pull request #611 from IBM/develop + +feat: Support for OSCAL 1.0.0 ([`0e9a4c5`](https://github.com/oscal-compass/compliance-trestle/commit/0e9a4c51f75470c202efa53b625e3181bd31254c)) + +* feat: remove validate mode option and yaml_header optional in ssp-gen (#607) + +* fixed ssp assemble + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* updated doc + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fixed error checking blank line + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* yaml header now optional in ssp-generate + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* removed validate -mode + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fully removed validate mode and updated docs + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fixed problem with missing header and now check all optional class members for None + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* clean up statement labels to satisfy regex in ssp-assemble + +Signed-off-by: frank <freestar8n@yahoo.com> + +* provide text for params when value not given. Add statement id to the Add description text + +Signed-off-by: frank <freestar8n@yahoo.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> +Co-authored-by: frank <freestar8n@yahoo.com> ([`3a5e104`](https://github.com/oscal-compass/compliance-trestle/commit/3a5e104d100feaad5334e8ee3231bdd6e93bbf82)) + +* feat: restore oscal write to use windows newlines on windows (#608) + +* restored oscal_write to use windows newlines on windows and removed dep. on filecmp + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* modified comment + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b7d8345`](https://github.com/oscal-compass/compliance-trestle/commit/b7d83458a233204b52e4271ee908392870992d5c)) + +* feat: Remove target model from trestle with OSCAL 1.0.0 release (#595) + +* feat: Remove target v1 + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Pre-merge commit. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Clean up UT's / formatting + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Remove docs references to target definition. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Remove typos and other issues identified in PR review. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Remove bad comments + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ececd37`](https://github.com/oscal-compass/compliance-trestle/commit/ececd3792281b08bf26831acee1254bd24338815)) + +* feat: Ingestion of XML and other improvements for the OSCO transformer. (#586) + +* 0.18.1 + +Automatically generated by python-semantic-release + +* feat: oscal normalize major changes to support new OSCAL 1.0.0 (#577) + +* removed nist modules + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* reloaded nist + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added oscal_normalize + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* first new oscal with common + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* tests now load + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* tmpdir -> tmp_path, fixed Model in files + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added lous fixes to transformers + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* more fixes for new oscal - 25 fail 379 pass + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix: Consolidate UUID sample and sample fix for POAM forward refs. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fixed ordering issue in oscal files + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix to poam forward + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix: Correct typing of assertion with OSCAL model changes. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fixed split compdef and updated split data up to including step2 + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* updated data in step3 of splitmerge + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added more files from split merge workflow + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* more fixes to data files. 11 fails + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* improved add tests, started updating profile for ssp. 10 failures. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix: Correct generator behaviour + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* ssp tests now pass - fixed simple profile for 1.0.0 + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fixed add and replicate failures + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fixed validate failure - replaced tests using target to use catalog instead + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fixed 2 import failures + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* removed test for load_dict, removed test for split too fine - all tests pass + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* boost validate test coverage + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* hooked oscal_normalize into gen_oscal and refined split of common files. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* now include oscal dir for yapf formatting. This commit is only a format change. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> + +* ingest xml and other improvements for OSCO transformer + +- enable ingestion of xml +- add target_type +- remove name & node +- improve test cases + +* Fix typo. + +Co-authored-by: semantic-release <semantic-release> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`f555f1e`](https://github.com/oscal-compass/compliance-trestle/commit/f555f1e1607edde8b6fc67d03b7804d28a0a345f)) + +* feat: oscal normalize major changes to support new OSCAL 1.0.0 (#577) + +* removed nist modules + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* reloaded nist + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added oscal_normalize + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* first new oscal with common + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* tests now load + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* tmpdir -> tmp_path, fixed Model in files + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added lous fixes to transformers + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* more fixes for new oscal - 25 fail 379 pass + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix: Consolidate UUID sample and sample fix for POAM forward refs. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fixed ordering issue in oscal files + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix to poam forward + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix: Correct typing of assertion with OSCAL model changes. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fixed split compdef and updated split data up to including step2 + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* updated data in step3 of splitmerge + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added more files from split merge workflow + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* more fixes to data files. 11 fails + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* improved add tests, started updating profile for ssp. 10 failures. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix: Correct generator behaviour + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* ssp tests now pass - fixed simple profile for 1.0.0 + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fixed add and replicate failures + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fixed validate failure - replaced tests using target to use catalog instead + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fixed 2 import failures + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* removed test for load_dict, removed test for split too fine - all tests pass + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* boost validate test coverage + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* hooked oscal_normalize into gen_oscal and refined split of common files. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* now include oscal dir for yapf formatting. This commit is only a format change. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`fd7e137`](https://github.com/oscal-compass/compliance-trestle/commit/fd7e137d0cc19527754e1e6a25c2361f9338a513)) + +### Fix + +* fix: remove incorrect scc_check_version in tanium transformer (#591) + +* fix: remove incorrect scc_check_version + +* Fix doc per Chris Butler's review. + +* Policy Validation Points, spelling. + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`4c59eda`](https://github.com/oscal-compass/compliance-trestle/commit/4c59edacfcacef2921711642776126a9b4e6a386)) + +* fix: duplicate oscal classes and reordered. oscal_write line ending (#592) + +* fixed duplicate oscal classes and reordered. oscal_write specifies unix line ending. increased test coverage. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added documentation + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`ddaeece`](https://github.com/oscal-compass/compliance-trestle/commit/ddaeecebbf884f7b96509e3c75d798f65472278a)) + +* fix: Ensure line endings do not change (#593) + +* fix: Ensure line endings do not change + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Scope git config to only the CICD user. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correct config scope. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`82fcab3`](https://github.com/oscal-compass/compliance-trestle/commit/82fcab3ea5e4b06b6ff31a6e2749b30729cfd48d)) + +## v0.18.1 (2021-06-17) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`2b987f9`](https://github.com/oscal-compass/compliance-trestle/commit/2b987f99f3f8bd3c4b36aec071887e7f4766882c)) + +### Fix + +* fix: Small scale fixes to the author validation system. (#572) (#573) + +* fix: Minor fixes of author capability + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Adding more unit tests + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Added test fixtures. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Remove redundant statement. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`04e16cc`](https://github.com/oscal-compass/compliance-trestle/commit/04e16ccd508607eadb2c0ab4db69fb324cf0e24c)) + +* fix: Small scale fixes to the author validation system. (#572) + +* fix: Minor fixes of author capability + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Adding more unit tests + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Added test fixtures. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Remove redundant statement. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`8cd2232`](https://github.com/oscal-compass/compliance-trestle/commit/8cd22323c0b0bcb556c15fa3bb91d4a7c36bb683)) + +## v0.18.0 (2021-06-17) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`f98a852`](https://github.com/oscal-compass/compliance-trestle/commit/f98a852b6782f0c0760b1aab8a30eeef16039085)) + +### Feature + +* feat: Allow explicit inclusion / exclusion of readme files in author workflows (#570) + +* feat: Optional flags for readme validation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Added missing test files. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`0ca1d20`](https://github.com/oscal-compass/compliance-trestle/commit/0ca1d202fa4865acf20fb9156a9c13437350b16e)) + +### Fix + +* fix: Replace yaml library to ensure that errors are thrown / recognised on duplicate keys. (#569) + +* chore: Moderniing to ruamel.yaml + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Bad testing data + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Replace yaml library with modernized and safe yaml library + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Fixing missing code format / linting. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Corrected behaviour in UT's by forcing file flush in oscal_write + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Correct docs setup. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: For content flushing / IO issues. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: More YAML IO sync issues + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9464420`](https://github.com/oscal-compass/compliance-trestle/commit/9464420cb3bba1dc684051ff35e2d13e9a115203)) + +### Unknown + +* Trestle release - update prior to OSCAL 1.0.0 support. + +Pre OSCAL 1.0.0 release ([`797a291`](https://github.com/oscal-compass/compliance-trestle/commit/797a2918dbbe4771ae950364c560c4561216b011)) + +## v0.17.0 (2021-06-09) + +### Chore + +* chore: Correct expression path. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9378863`](https://github.com/oscal-compass/compliance-trestle/commit/9378863861270f67fe16d6a6e4891d2856a55878)) + +* chore: readding comments. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`4a45cff`](https://github.com/oscal-compass/compliance-trestle/commit/4a45cff3485039681643ba7eb52f3a41a5ff739f)) + +* chore: CICD refinements + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`c09119c`](https://github.com/oscal-compass/compliance-trestle/commit/c09119ce80c38b4d4d966e80a420ef7e0731131c)) + +* chore: Merge back version tags and changelog into develop. ([`2f88d60`](https://github.com/oscal-compass/compliance-trestle/commit/2f88d60d0f599778d5005c636c7a404c385c0071)) + +### Feature + +* feat: ssp generation of markdown files for groups of controls (#556) + +* added ssp_generator and test + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added section output and separate file for md_writer + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* ssp now a command and improved tests + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added docs for ssp + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* clean up and boost coverage + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added comments + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* initial ssp creation + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* now output ssp json + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* made requested changes for ssp generation + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* changed add to get in func name + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* split ssp into ssp-generate and ssp-assemble + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`1dcf139`](https://github.com/oscal-compass/compliance-trestle/commit/1dcf1395469b20b32e67c02cc52ede15d5b35f4b)) + +* feat: Update `trestle md` to `trestle author` and introduce functionality for validating drawio metadata. (#551) + +* feat: renamed md to author to prepare for drawio content + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Ensure mkdocs must update successfully + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* hello + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: reorganisation of code to clean up + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Cleanup of the codebase as exists to meet formatting / linting. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: More cleanup + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Significant cleanups of markdown (now author) codebase. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Code formatting was missing. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Add missing test files + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: Finish basic implementation of header validation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Cleanup documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: Added documentation for author and enforce utf-8 everywhere + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Complete unit testing for author headers + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Added missing unit tests for DrawIOMetadataValidator + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Adding more unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Corrected drawio behaviour where it was not raising an exception + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Additional fixes + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added missing dependencies + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* adding utility functions + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Removed google analytics which no longer is supported. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Cleaned up reporting + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Small documentation updates. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`2567e6c`](https://github.com/oscal-compass/compliance-trestle/commit/2567e6c55039ce4b2db0d76fb4ae3c7495a26301)) + +### Fix + +* fix: Lint PR firing off dev (#562) + +* fix Lint PR firing off dev + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Added small set of updates + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`81f44c6`](https://github.com/oscal-compass/compliance-trestle/commit/81f44c628d687ab4f0d96b9c16d018459e9fc062)) + +* fix: [ImgBot] Optimize images (#560) + +*Total -- 1,247.86kb -> 604.94kb (51.52%) + +/docs/assets/drawio_editing_data.png -- 558.20kb -> 257.90kb (53.8%) +/docs/assets/drawio_data_menu.png -- 663.19kb -> 321.66kb (51.5%) +/docs/tutorials/continuous-compliance/ContinuousCompliance.jpg -- 26.46kb -> 25.38kb (4.11%) + +Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com> + +Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> ([`62b870d`](https://github.com/oscal-compass/compliance-trestle/commit/62b870d3d98bf2a67be2c7fc68b0cf9e8d4b7f07)) + +* fix: Allow for check suite to trigger a PR + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`5c95318`](https://github.com/oscal-compass/compliance-trestle/commit/5c95318f8c43b6901d0992512e029d2aa584a73c)) + +* fix: Allow for check suite to trigger a PR + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9bce041`](https://github.com/oscal-compass/compliance-trestle/commit/9bce041a02326d9e148ada7271eda5dbda46e504)) + +* fix: Allow for test completion to trigger automerge correctly + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`dc6864f`](https://github.com/oscal-compass/compliance-trestle/commit/dc6864f8a3bc03ec1f694d25dbeda19969507ab9)) + +* fix: correct github expression path. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9ab4936`](https://github.com/oscal-compass/compliance-trestle/commit/9ab4936dc0aef7d4b2bd445dd4d8f1e3a13c6f9b)) + +* fix: Ensrue automerge fires off correctly + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d0f51b8`](https://github.com/oscal-compass/compliance-trestle/commit/d0f51b841073d06269272f2e5f5a7f04bb07bc3a)) + +* fix: CICD refinements + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a2d836b`](https://github.com/oscal-compass/compliance-trestle/commit/a2d836bc8e29d6cbe16346ed4172e258546e1196)) + +* fix: Dump context in automerge workflow. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`144a54f`](https://github.com/oscal-compass/compliance-trestle/commit/144a54f8ef51252b4a4fec6117e85b388cd69b17)) + +* fix: Cleanup CIDC workflow to prevent admin rights pushing over checks. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`56127e7`](https://github.com/oscal-compass/compliance-trestle/commit/56127e733dc0539d36e3faf32be1c3be701da1d8)) + +* fix: Cleanup CIDC workflow to prevent admin rights pushing over checks. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a305ebb`](https://github.com/oscal-compass/compliance-trestle/commit/a305ebb24c8595a0014afe1d6da5886400f1211b)) + +* fix: Cleanup CIDC workflow to prevent admin rights pushing over checks. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`31e8cde`](https://github.com/oscal-compass/compliance-trestle/commit/31e8cde6b68009372a7dcf9562dc6e420ecec6d2)) + +### Unknown + +* Merge pull request #561 from IBM/develop ([`da34485`](https://github.com/oscal-compass/compliance-trestle/commit/da344851f6b373e19f900899c64f147eb08d7ff9)) + +* Merge pull request #552 from IBM/fix/cicd_cleanup ([`48d537b`](https://github.com/oscal-compass/compliance-trestle/commit/48d537bedc40f5127dba008f72fc63e5b4897457)) + +* Merge branch 'develop' into fix/cicd_cleanup ([`7b099c6`](https://github.com/oscal-compass/compliance-trestle/commit/7b099c65a8843fb33aaf9a89d7c0f6081c54fda2)) + +## v0.16.0 (2021-05-28) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`a463460`](https://github.com/oscal-compass/compliance-trestle/commit/a46346082a8c98d85354fcb0e51b0c63d9d60b0f)) + +### Feature + +* feat: OSCO transformer conform to Results interface class. (#532) ([`fc251b9`](https://github.com/oscal-compass/compliance-trestle/commit/fc251b9e9c231de67fd214b16bdd7c2a6cb4d3c1)) + +### Fix + +* fix: move unreachable debug statement + +Signed-off-by: Doug Chivers <doug.chivers@uk.ibm.com> ([`f5b9c1a`](https://github.com/oscal-compass/compliance-trestle/commit/f5b9c1a029e6257c789ebc573105b582dca23e1b)) + +* fix: move unreachable debug statement ([`0ce9c24`](https://github.com/oscal-compass/compliance-trestle/commit/0ce9c24a8fcc5e464f4194970e82740e6c0cd4f1)) + +* fix: Complete coverage of drawio class + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`225403c`](https://github.com/oscal-compass/compliance-trestle/commit/225403c4f85ca77cb322bb9620992ab0c6673e9b)) + +* fix: Adding basic UT suite for drawio. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`44cc8c3`](https://github.com/oscal-compass/compliance-trestle/commit/44cc8c3fcb57bb23743fbe12d5bc180bf13edab5)) + +* fix: Corrected errors + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`8187d6d`](https://github.com/oscal-compass/compliance-trestle/commit/8187d6d5932669dddd676e68c24fe0d058703d52)) + +* fix: correcting errors + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`5bfedac`](https://github.com/oscal-compass/compliance-trestle/commit/5bfedac6575d3e57ea530b0e69e55ebbcbb26c37)) + +* fix: improve devops to stop squash merging to main (#542) ([`a8313fb`](https://github.com/oscal-compass/compliance-trestle/commit/a8313fbf75b8c8eb5d2791b2dadafc1be03cc492)) + +### Unknown + +* Merge pull request #550 from IBM/develop ([`736d2d4`](https://github.com/oscal-compass/compliance-trestle/commit/736d2d4130210a571eacf36a24403b4a26c570e5)) + +* Merge pull request #549 from IBM/fix/split_roles ([`11add07`](https://github.com/oscal-compass/compliance-trestle/commit/11add074c00c9d96dbe8a493976e61e55961624c)) + +* fixed incorrect comment line + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`0ccd64e`](https://github.com/oscal-compass/compliance-trestle/commit/0ccd64ef75d79a7e088fc16e39397bba3c452a19)) + +* fix to bug splitting roles and compdefs. Better handling of lists and dicts in splits + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`d17a8f9`](https://github.com/oscal-compass/compliance-trestle/commit/d17a8f94447494dfb523a75c04a0d06f89d234fe)) + +* Merge pull request #539 from IBM/feat/drawio-metadata ([`20b848b`](https://github.com/oscal-compass/compliance-trestle/commit/20b848b903e529dec99177163220a4aa7e23624f)) + +* Merge develop into feat/drawio-metadata ([`f47d7a6`](https://github.com/oscal-compass/compliance-trestle/commit/f47d7a65a62c54f0a54ced213d73db596d5d5bbb)) + +* Merge pull request #546 from IBM/fix/split-debug-txt ([`e98af5e`](https://github.com/oscal-compass/compliance-trestle/commit/e98af5e18a452079db7fbca65731122df3029e69)) + +* move unreachable debug statement ([`b104a3d`](https://github.com/oscal-compass/compliance-trestle/commit/b104a3d4a30952615bbfe906e3a42dc03aa9c07f)) + +* Merge branch 'develop' into feat/drawio-metadata ([`265cb91`](https://github.com/oscal-compass/compliance-trestle/commit/265cb91a89ee681f0701659c91d19bbf95120e3c)) + +* Merge branch 'develop' into feat/drawio-metadata ([`7278618`](https://github.com/oscal-compass/compliance-trestle/commit/72786181d8b00a536b1e98d0ba34ce6f5f919c47)) + +## v0.15.1 (2021-05-20) + +### Chore + +* chore: Release to main to update documentation (#537) ([`ecd5a58`](https://github.com/oscal-compass/compliance-trestle/commit/ecd5a589f82e1c8cc2d8fb576ab413643c88f5f7)) + +* chore: clean bad data files and improve all_validator feedback (#536) ([`2cb9d7c`](https://github.com/oscal-compass/compliance-trestle/commit/2cb9d7ceb093b1071cbd2184d6191aa07a49f3bd)) + +* chore: update tools and models for 914 (#534) ([`163043f`](https://github.com/oscal-compass/compliance-trestle/commit/163043fa6837ded959a63f3de13c0cac12022b80)) + +* chore: Added drawio UTs + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`56aabeb`](https://github.com/oscal-compass/compliance-trestle/commit/56aabeb427962c450c0252653d42f0a9de7555e8)) + +* chore: Updated some docs to trigger a PR (#523) + +* chore: Updated some docs to trigger a PR + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: there is a mistake in the workflow syntax + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`6c4ad8c`](https://github.com/oscal-compass/compliance-trestle/commit/6c4ad8cefd7e3b6b69f4838611eec0ccdcb20f01)) + +* chore: Clean up PR automation (#521) + +* chore: DevOps automation for PRs + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Experiment with pr helper + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Experiment with pr helper + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: cleanup CICD pipelines to help remove duplication + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: cleanup CICD pipelines to help remove duplication + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: cleanup CICD pipelines to help remove duplication + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: cleanup CICD pipelines to help remove duplication + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Specify explicitly action versions + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: revised filtering to decrease the number of runs + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`35ce91a`](https://github.com/oscal-compass/compliance-trestle/commit/35ce91a65543255ce053633ade0543bfcdf02223)) + +* chore: CICD improvements (#518) + +* chore: DevOps automation for PRs + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: DevOps automation for PRs + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added cache to github actions to accelerate workflow. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added cache to github actions to accelerate workflow. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: change versions + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: change versions + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Clean up build process + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Conventional PR + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Conventional PR + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Conventional PR + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Change automerge tooling + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Change automerge tooling + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Experiment with pr helper + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Experiment with pr helper + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Experiment with pr helper + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Experiment with pr helper + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Experiment with pr helper + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Experiment with pr helper + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`64c95cd`](https://github.com/oscal-compass/compliance-trestle/commit/64c95cd21816919d702aac72863e89f5d020c007)) + +* chore: Merge back version tags and changelog into develop. ([`4d0acd4`](https://github.com/oscal-compass/compliance-trestle/commit/4d0acd466cd82d370c0e018f4f1d05e7bc303c45)) + +### Documentation + +* docs: Reorg and cleanup content (#531) ([`380e924`](https://github.com/oscal-compass/compliance-trestle/commit/380e92476ff63126df470f31a4e8e0190e608fad)) + +* docs: Updated third party schema as per latest tanium to oscal conversion and added it to documentation (#527) ([`9feb690`](https://github.com/oscal-compass/compliance-trestle/commit/9feb6908c80c3873cf310079144fbbbe20002c54)) + +* docs: More google style doc strings (#526) ([`28914f0`](https://github.com/oscal-compass/compliance-trestle/commit/28914f088a78b57fdfb090eda662ea5c8b362884)) + +* docs: Addtional documentation. (#525) ([`516f01e`](https://github.com/oscal-compass/compliance-trestle/commit/516f01eb0eff580bcfc95ea7b0909cd0ebdb8221)) + +* docs: Small set of document updates (#524) + +* docs: Small set of document updates + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Update again + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: more cleaning and error logging + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`7b339d7`](https://github.com/oscal-compass/compliance-trestle/commit/7b339d7e81d0a2e626bc29c7718d0e1081996fbb)) + +### Feature + +* feat: functionaly complete + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`b7c903b`](https://github.com/oscal-compass/compliance-trestle/commit/b7c903b703c78026ac14e31177cd4e3a7541d469)) + +* feat: oscal version validator (#528) ([`2b132d5`](https://github.com/oscal-compass/compliance-trestle/commit/2b132d5f09832452def258284bb40090d32bab01)) + +* feat: create title - place names in title of created objects - issue #473 (#519) + +* upgrade pydantic to 1.8.2 for security issue + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* Simple change to insert model name in created objects. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b676ed3`](https://github.com/oscal-compass/compliance-trestle/commit/b676ed379b4328f3b69fe1806a7dad46ccc5319a)) + +### Fix + +* fix: Trigger release (#540) ([`aeffa5b`](https://github.com/oscal-compass/compliance-trestle/commit/aeffa5b5aa1609b23fdbfed7d167068e366f72e9)) + +* fix: Remove problematic concurrency restrictions in devops pipeline (#538) ([`5181c70`](https://github.com/oscal-compass/compliance-trestle/commit/5181c70b44e283a21b4fedb05ecc36590d04c319)) + +* fix: stop split at strings, better handling of component-def splits (#506) ([`43c9edd`](https://github.com/oscal-compass/compliance-trestle/commit/43c9edd790579a7000a444a703b2d30a485480d1)) + +* fix: Correct bad syntax in devops tooling. ([`dcec2ea`](https://github.com/oscal-compass/compliance-trestle/commit/dcec2eaeacff7e7ad981e801255c844a37446390)) + +* fix: Ensure PR automation system cannot override checks. (#522) + +* chore: DevOps automation for PRs + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Experiment with pr helper + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Experiment with pr helper + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: cleanup CICD pipelines to help remove duplication + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: cleanup CICD pipelines to help remove duplication + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: cleanup CICD pipelines to help remove duplication + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: cleanup CICD pipelines to help remove duplication + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Specify explicitly action versions + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: revised filtering to decrease the number of runs + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: TSetting up automerge that respects permissions + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: TSetting up automerge that respects permissions + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Remove aconcurrency restriction from matrix build jobs. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Remove aconcurrency restriction from matrix build jobs. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Remove aconcurrency restriction from matrix build jobs. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`5817316`](https://github.com/oscal-compass/compliance-trestle/commit/5817316ff06cecba6b3662b96cb77655aa70277b)) + +* fix: Correct semantic / conventional commit behaviour (#520) + +* chore: DevOps automation for PRs + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Experiment with pr helper + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Experiment with pr helper + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`a6f7d01`](https://github.com/oscal-compass/compliance-trestle/commit/a6f7d013998e0a198347d987558f7974e372b5ea)) + +### Unknown + +* Merge branch 'main' into develop ([`8aa6b82`](https://github.com/oscal-compass/compliance-trestle/commit/8aa6b828bfaaf9f9bceb50da13de271a7d3b954b)) + +## v0.15.0 (2021-05-13) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`d6cf057`](https://github.com/oscal-compass/compliance-trestle/commit/d6cf0576e4408d349f0a156e4e0d70ff76f60378)) + +### Feature + +* feat: Added error checking and enforce 1 to 1 keys in header validation (#512) + +* added error checking and enforce 1 to 1 keys in yaml validation + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added test + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* key test + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added header-only validation + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* header validation for gov folders + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added dir recursion for gov header validate + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`da95862`](https://github.com/oscal-compass/compliance-trestle/commit/da958620ffca76cbfae1762159a7ca51007c8b88)) + +* feat: Role ID cross reference validator and refactors to validators to allow all + +* added role id refs validation and refactored validators + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* renamed and added validator files + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added check for item name and made roleid name more consistent + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* removed -item validator option, added all validator, import now validates all + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`c894704`](https://github.com/oscal-compass/compliance-trestle/commit/c894704875ae54e8376fb50d62cd064f1d293b66)) + +* feat: Roleid validation via ncname and parametrized tests (#499) + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`84dc9a2`](https://github.com/oscal-compass/compliance-trestle/commit/84dc9a293e35f1c4010a38c7ecc8f99e5fa7dfb2)) + +### Fix + +* fix: Upgrade pydantic to 1.8.2 for security issue (#513) + +* upgrade pydantic to 1.8.2 for security issue + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* Constrain markupsafe to the correct version + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Constrain markupsafe to the correct version + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Constrain markupsafe to the correct version + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`6e01f36`](https://github.com/oscal-compass/compliance-trestle/commit/6e01f36cc6fdfd8b14d453f470968ad7ea4164fa)) + +* fix: Remove problematic code-QL plugin which is causing problems. (#507) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`47529a7`](https://github.com/oscal-compass/compliance-trestle/commit/47529a7714f0c99bb711033ca1863651de99dbf5)) + +### Unknown + +* Merge pull request #517 from IBM/develop + +Release: Security update and gov header only scanning. ([`da99cfe`](https://github.com/oscal-compass/compliance-trestle/commit/da99cfe0b3a769eba3ec6fdb0ad2e3d63aa9d72d)) + +* feat:Tanium converged format updated to IBM SCC format (#515) + +* Tanium converged format + +Signed-off-by: Lou DeGenaro <degenaro@li-dd41d84c-35a5-11b2-a85c-eb5d345ed15a.ibm.com> + +* Revise doc. + +Signed-off-by: Lou DeGenaro <degenaro@li-dd41d84c-35a5-11b2-a85c-eb5d345ed15a.ibm.com> + +* fix: Upgrade pydantic to 1.8.2 for security issue (#513) + +* upgrade pydantic to 1.8.2 for security issue + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* Constrain markupsafe to the correct version + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Constrain markupsafe to the correct version + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Constrain markupsafe to the correct version + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Lou DeGenaro <degenaro@li-dd41d84c-35a5-11b2-a85c-eb5d345ed15a.ibm.com> + +Co-authored-by: degenaro <degenaro@localhost> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b2b0db6`](https://github.com/oscal-compass/compliance-trestle/commit/b2b0db6584f985b0c0d634f08c43e835b41e6a6b)) + +## v0.14.4 (2021-04-22) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`6c5e7b1`](https://github.com/oscal-compass/compliance-trestle/commit/6c5e7b1ef8dbf1b8e17c1fdf2ebf64c605779fcb)) + +### Fix + +* fix: Add timestamp to tanium-to-oscal transformer (#503) + +* Feat/tanium scc (#493) + +* Tanium transformer revisions + +- add add components +- change namespace +- use agreed upon class identifiers and remove others +- use statement-id +- add end time +- list controls in verbose mode +- manage "pocket" for missing computer-name + +* Update tanium-to-oscal tutorial + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> + +* Feat/tanium scc 2 (#497) + +* Tanium transformer revisions + +- add add components +- change namespace +- use agreed upon class identifiers and remove others +- use statement-id +- add end time +- list controls in verbose mode +- manage "pocket" for missing computer-name + +* Update tanium-to-oscal tutorial + +Co-authored-by: degenaro <lou.degenaro@gmail.com> + +* Feat/tanium observation timestamp (#502) + +* Add timestamp property to each observation. + +* Add timestamp property to each observation. + +* Update tutorial to include timestamp property. + +Co-authored-by: Chris Butler <chris@thebutlers.me> +Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`e8dc204`](https://github.com/oscal-compass/compliance-trestle/commit/e8dc204935b5d1f4584bcaaef77bba2c41d80a9f)) + +### Unknown + +* Feat/tanium observation timestamp (#502) + +* Add timestamp property to each observation. + +* Add timestamp property to each observation. + +* Update tutorial to include timestamp property. ([`688bc35`](https://github.com/oscal-compass/compliance-trestle/commit/688bc350f0afba47a3122a18fe66304d2732eaff)) + +## v0.14.3 (2021-04-20) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`17cd61c`](https://github.com/oscal-compass/compliance-trestle/commit/17cd61c3a8d024af06b7620fffb61e51c40c37a9)) + +### Fix + +* fix: tanium updates for scc, 2 (#498) + +* Feat/tanium scc (#493) + +* Tanium transformer revisions + +- add add components +- change namespace +- use agreed upon class identifiers and remove others +- use statement-id +- add end time +- list controls in verbose mode +- manage "pocket" for missing computer-name + +* Update tanium-to-oscal tutorial + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> + +* Feat/tanium scc 2 (#497) + +* Tanium transformer revisions + +- add add components +- change namespace +- use agreed upon class identifiers and remove others +- use statement-id +- add end time +- list controls in verbose mode +- manage "pocket" for missing computer-name + +* Update tanium-to-oscal tutorial + +Co-authored-by: degenaro <lou.degenaro@gmail.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> +Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`9b9b61e`](https://github.com/oscal-compass/compliance-trestle/commit/9b9b61e6236da2f15cd6fc125925c6e4e708465f)) + +### Unknown + +* Feat/tanium scc 2 (#497) + +* Tanium transformer revisions + +- add add components +- change namespace +- use agreed upon class identifiers and remove others +- use statement-id +- add end time +- list controls in verbose mode +- manage "pocket" for missing computer-name + +* Update tanium-to-oscal tutorial + +Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`bd12c27`](https://github.com/oscal-compass/compliance-trestle/commit/bd12c274afd30aab55ca41afcad3ed37da5f52e3)) + +## v0.14.2 (2021-04-20) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`2ce5be2`](https://github.com/oscal-compass/compliance-trestle/commit/2ce5be2a1a0469bf4ec0e77acabf84e29ff6c6fa)) + +* chore: Merge back version tags and changelog into develop. ([`76092cd`](https://github.com/oscal-compass/compliance-trestle/commit/76092cd547ff82cb2d33f882319dd509d5778242)) + +* chore: Merge back version tags and changelog into develop. ([`1956a42`](https://github.com/oscal-compass/compliance-trestle/commit/1956a426896aca92aa2e7688c9f41b9f1ae4086b)) + +### Fix + +* fix: tanium enhancements for scc + +* Tanium transformer revisions + +- add add components +- change namespace +- use agreed upon class identifiers and remove others +- use statement-id +- add end time +- list controls in verbose mode +- manage "pocket" for missing computer-name + +* Update tanium-to-oscal tutorial + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> +Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`8bae421`](https://github.com/oscal-compass/compliance-trestle/commit/8bae421df04a7683bccc52ea40420bb85d4bcebe)) + +### Unknown + +* Revert "Feat/tanium scc (#493) (#494)" (#495) + +This reverts commit 98109ce27e4a9ff4917ba7bcb99790ed02a58963. ([`7ccaf35`](https://github.com/oscal-compass/compliance-trestle/commit/7ccaf3568da532066b02c31e7050ca265d6dde58)) + +* Feat/tanium scc (#493) (#494) + +* Tanium transformer revisions + +- add add components +- change namespace +- use agreed upon class identifiers and remove others +- use statement-id +- add end time +- list controls in verbose mode +- manage "pocket" for missing computer-name + +* Update tanium-to-oscal tutorial + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> +Co-authored-by: degenaro <lou.degenaro@gmail.com> ([`98109ce`](https://github.com/oscal-compass/compliance-trestle/commit/98109ce27e4a9ff4917ba7bcb99790ed02a58963)) + +* Feat/tanium scc (#493) + +* Tanium transformer revisions + +- add add components +- change namespace +- use agreed upon class identifiers and remove others +- use statement-id +- add end time +- list controls in verbose mode +- manage "pocket" for missing computer-name + +* Update tanium-to-oscal tutorial + +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> ([`264966c`](https://github.com/oscal-compass/compliance-trestle/commit/264966c2b8b20da315179fbf9cee5dd13aefb3ed)) + +## v0.14.1 (2021-04-16) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`840c73a`](https://github.com/oscal-compass/compliance-trestle/commit/840c73a6edec203b7dd35bac804b098469e68f41)) + +### Fix + +* fix: Chore/fs cleanup (#489) + +* cleanup of fs.py to allow relative and absolute paths + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* global change of absolute() to resolve() + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added debug lines and exception handling + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* better resolve handling, updated docs, silenced stack trace, added debug lines + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fixed docs typos + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`bf8be03`](https://github.com/oscal-compass/compliance-trestle/commit/bf8be03fc62e56928e8f92cfe746b004e0c54b71)) + +### Unknown + +* Merge pull request #492 from IBM/develop + +Release to main: essential fixes to file IO ([`6be5246`](https://github.com/oscal-compass/compliance-trestle/commit/6be5246b530a6613f7af8cf5ad1ba689d8806f0b)) + +## v0.14.0 (2021-04-15) + +### Chore + +* chore: Update pre-commit markdown formatting (#476) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`89946e6`](https://github.com/oscal-compass/compliance-trestle/commit/89946e6458958343193f0d66f6af94d5b38ef69e)) + +* chore: Merge back version tags and changelog into develop. ([`c31cfa0`](https://github.com/oscal-compass/compliance-trestle/commit/c31cfa07b868cdff44ec125b6bcdde6bf5dd5f96)) + +### Feature + +* feat: Release of enhanced markdown functionality ([`f327fd6`](https://github.com/oscal-compass/compliance-trestle/commit/f327fd67131c90afbe6c3644ab41b0dc56412b78)) + +* feat: Assessment result schema updates(#481) + +* changed print to logger + +* Added experiments profiling setup + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* added flah to benchmark with or without json serialization + +* readme file for assessment. result object + +* changed prinet to logger + +Signed-off-by: Vikas <avikas@in.ibm.com> + +* feat: Update NIST models to latest including refactors & UT's + +* feat:Update Oscal version + +Signed-off-by: Chris Butler <chris@thebutlers.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 <frankst@au1.ibm.com> + +* removed ssp validate test + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fixed code format + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix:Reworking generators + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* cleaned up gen-oscal.py and regenerated the oscal models. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> +Co-authored-by: degenaro <lou.degenaro@gmail.com> +Signed-off-by: Vikas <avikas@in.ibm.com> + +* 0.11.0 + +Automatically generated by python-semantic-release + +Signed-off-by: Vikas <avikas@in.ibm.com> + +* feat:Improved serialisation support for OscalBaseModel (#454) + +* feat:Improved serialization support. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Serializing by appropriate key and minimizing file size. + +Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Vikas <avikas@in.ibm.com> + +* Feat:transformer factory (#455) + +* initial prototype of transformer factory + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added singleton transformer factory + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added base transformer class + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* more fixes and added tests + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added test for transform factory + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* restructured, added more docs and tests. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* removed bad file names. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix:Typing information + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Vikas <avikas@in.ibm.com> + +* 0.12.0 + +Automatically generated by python-semantic-release + +Signed-off-by: Vikas <avikas@in.ibm.com> + +* Added experiments profiling setup + +Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Vikas <avikas@in.ibm.com> + +* added flah to benchmark with or without json serialization + +Signed-off-by: Vikas <avikas@in.ibm.com> + +* readme file for assessment. result object + +Signed-off-by: Vikas <avikas@in.ibm.com> + +* feat: Update of OSCAL schema to 1.0.0-rc2 (#465) + +* feat:Update core OSCAL schema + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Corrected OSCAL version in the docs + +Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Vikas <avikas@in.ibm.com> + +* fix: Cleanup of fs.py to allow relative and absolute paths (#464) + +* cleanup of fs.py to allow relative and absolute paths + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* global change of absolute() to resolve() + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Vikas <avikas@in.ibm.com> + +* feat: Tanium to oscal tranform refactored to exploit the ResultsTransformer interface (#466) + +* ResultsTransformer interface + +* remove trestle.utils.tanium + +* remove trestle.utils.tanium.py + +* added registration of tanium transformer + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added name for registration + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> +Co-authored-by: FrankSuits <frankst@au1.ibm.com> +Signed-off-by: Vikas <avikas@in.ibm.com> + +* 0.13.0 + +Automatically generated by python-semantic-release + +Signed-off-by: Vikas <avikas@in.ibm.com> + +* fix:Corrected transforms behaviour and added example script. (#468) + +Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Vikas <avikas@in.ibm.com> + +* 0.13.1 + +Automatically generated by python-semantic-release + +Signed-off-by: Vikas <avikas@in.ibm.com> + +* chore: Update pre-commit markdown formatting (#476) + +Signed-off-by: Chris Butler <chris@thebutlers.me> +Signed-off-by: Vikas <avikas@in.ibm.com> + +* fix:Moved directories to fix testing errors. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Moved directories to fix testing errors. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chnaged benchmark to use transform API + +* removed script reslted to thrid party - exchange protocol, observations and their tests + +* fix:Perf tuning of OscalBaseModel serialization. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Mkdocs automation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Mkdocs automation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Vikas <avikas@in.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> +Co-authored-by: Frank Suits <47203786+fsuits@users.noreply.github.com> +Co-authored-by: degenaro <lou.degenaro@gmail.com> +Co-authored-by: semantic-release <semantic-release> +Co-authored-by: FrankSuits <frankst@au1.ibm.com> ([`0f5c4ee`](https://github.com/oscal-compass/compliance-trestle/commit/0f5c4eedb0eaa1afcc2f11cfca026e840cbfac37)) + +* feat: trestle markdown updates (#477) + +* chore: Commit for merge workflow + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Adding more unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Adding more unit tests and documentation. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ddc2420`](https://github.com/oscal-compass/compliance-trestle/commit/ddc2420ff71dae6fcb6597654d69dbd16fba8cb6)) + +## v0.13.1 (2021-04-13) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`10d6634`](https://github.com/oscal-compass/compliance-trestle/commit/10d663499c617fdea797e5d92810bcc0b55e5ec5)) + +* chore: Merge back version tags and changelog into develop. ([`7dd62f4`](https://github.com/oscal-compass/compliance-trestle/commit/7dd62f4ca10fc7f4f2e21411741e3ffb1d827508)) + +### Fix + +* fix: Force release. + +fix: Force release ([`0e90265`](https://github.com/oscal-compass/compliance-trestle/commit/0e90265c7192979a613c30abd3561a68b612d8ac)) + +### Unknown + +* Minor release: Fix behaviour of trestle transforms + +Minor release: Fix behaviour of trestle transforms ([`02d23b5`](https://github.com/oscal-compass/compliance-trestle/commit/02d23b5ed0a7e68c8b3a74cc8b50e1fe76ba8315)) + +* fix:Corrected transforms behaviour and added example script. (#468) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`7f05800`](https://github.com/oscal-compass/compliance-trestle/commit/7f0580042842663f39c8c221a890c6e77ac700da)) + +## v0.13.0 (2021-04-13) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`78fc812`](https://github.com/oscal-compass/compliance-trestle/commit/78fc812965797e676629c8afde132011a4abd94b)) + +### Feature + +* feat: Tanium to oscal tranform refactored to exploit the ResultsTransformer interface (#466) + +* ResultsTransformer interface + +* remove trestle.utils.tanium + +* remove trestle.utils.tanium.py + +* added registration of tanium transformer + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added name for registration + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> +Co-authored-by: FrankSuits <frankst@au1.ibm.com> ([`6fced57`](https://github.com/oscal-compass/compliance-trestle/commit/6fced57a5c011aafb26220e94b038ebae884b20d)) + +* feat: Update of OSCAL schema to 1.0.0-rc2 (#465) + +* feat:Update core OSCAL schema + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Corrected OSCAL version in the docs + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`4e2f64d`](https://github.com/oscal-compass/compliance-trestle/commit/4e2f64dd5a4f80f4081c0168b0e669b97dab79c8)) + +### Fix + +* fix: Cleanup of fs.py to allow relative and absolute paths (#464) + +* cleanup of fs.py to allow relative and absolute paths + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* global change of absolute() to resolve() + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`1407911`](https://github.com/oscal-compass/compliance-trestle/commit/140791190569e5673a216fe8dfdffc35d6c2424e)) + +### Unknown + +* Release to update to OSCAL 1.0.0-rc2 + +Release to update to OSCAL 1.0.0-rc2 ([`5f6c05d`](https://github.com/oscal-compass/compliance-trestle/commit/5f6c05d7cd3f79d4303689872e22d0f5b66a4c28)) + +## v0.12.0 (2021-04-09) + +### Chore + +* chore: Merge back version tags and changelog into develop. ([`e3d7f69`](https://github.com/oscal-compass/compliance-trestle/commit/e3d7f698caa3a99a7e484ed4d0ff6c87c2ef5497)) + +### Feature + +* feat: Release of transformation factory interface for beta testing. + +Release of transformation factory interface for beta testing. ([`a036522`](https://github.com/oscal-compass/compliance-trestle/commit/a0365226175adfd38c5e37d863c4c50038a1658c)) + +### Unknown + +* Feat:transformer factory (#455) + +* initial prototype of transformer factory + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added singleton transformer factory + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added base transformer class + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* more fixes and added tests + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* added test for transform factory + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* restructured, added more docs and tests. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* removed bad file names. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix:Typing information + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`a5c86fd`](https://github.com/oscal-compass/compliance-trestle/commit/a5c86fd374a9cfc96859c22f8056dddefb3607e5)) + +* feat:Improved serialisation support for OscalBaseModel (#454) + +* feat:Improved serialization support. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Serializing by appropriate key and minimizing file size. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`b87f158`](https://github.com/oscal-compass/compliance-trestle/commit/b87f158d9b1f54a3fc68857d7732ceb8a2f830df)) + +## v0.11.0 (2021-04-08) + +### 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's + +* feat:Update Oscal version + +Signed-off-by: Chris Butler <chris@thebutlers.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 <frankst@au1.ibm.com> + +* removed ssp validate test + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fixed code format + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix:Reworking generators + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* cleaned up gen-oscal.py and regenerated the oscal models. + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.me> +Co-authored-by: degenaro <lou.degenaro@gmail.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 <chris@thebutlers.me> + +* Update for merge + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: MVP markdown validator working + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* feat: MVP markdown validator working + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Initial full pass of content validation for markdown. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Added missing test files for md workflows. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Correct dependency issues. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Refactored md codebase. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Fixed up unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Adding markdown_validator tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Small updates. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Removing governed projects to reduce scope of PR + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Adding UT's for trestle md subcommands. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Added unit test for allowed_task_name + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: more UT's + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Adding more unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Removing python 3.8+ feature from unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* docs: Adding more documentation. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Updating docs + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Adding windows dependencies + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Added unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* added windows tests for hidden files + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> + +* fix:documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Completed documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Correcting unit tests with bad logic + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: More unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: FrankSuits <frankst@au1.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 <jeffetan@au1.ibm.com> + +* feat (remote) More tests for HTTPS Fetcher. + +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* feat (remote) More tests for HTTPS Fetcher and some improvements. + +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> + +* feat (remote) Minor error message fix. + +* feat (remote) Minor error message fix. + +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* feat (remote) Removed outfile use -- was left over from debugging. + +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.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 <frankst@au1.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 <frankst@au1.ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.me> + +* chore:Add google analytics to website. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`eedf171`](https://github.com/oscal-compass/compliance-trestle/commit/eedf17180e0ffef777ed1b1b5b6451ac5661462c)) + +* chore:Updating mkdocs to avoid errors (#438) + +Signed-off-by: Chris Butler <chris@thebutlers.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 <frankst@au1.ibm.com> + +* some cleanup and added docs + +Signed-off-by: FrankSuits <frankst@au1.ibm.com> ([`805485f`](https://github.com/oscal-compass/compliance-trestle/commit/805485ffafe0ebc6dd08573d347924eccb6debb9)) + +* tutorial: what's your compliance posture? (#427) + +* tutorial: what's your compliance posture? + +* changed trestle links and fixed typos + +Signed-off-by: Frank Suits <frankst@au1.ibm.com> + +Co-authored-by: FrankSuits <frankst@au1.ibm.com> ([`49c5870`](https://github.com/oscal-compass/compliance-trestle/commit/49c5870dd9a9c3a8cb79c739e3e6d39dfc9b7df7)) + +## v0.10.0 (2021-03-25) + +### 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 <chris@thebutlers.me> + +* fix: Small corrections + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Formatting issues introduced by manual merging in GH + +Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.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 <chris@thebutlers.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 <chris@thebutlers.me> + +* feat:Added exchange protocol support + +Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.me> + +* fix: Updated documentation to pass build. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: leveraged new capability in load_distributed. + +Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.me> + +* feat:Added exchange protocol support + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Cleanup for merge. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix:Added UT's and corrected schema to work with gen_oscal.py + +Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.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 <chris@thebutlers.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 "lite" 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 <chris@thebutlers.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 <chris@thebutlers.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 <chris@thebutlers.me> + +* docs: Call out restriction in changes + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`32ae0e8`](https://github.com/oscal-compass/compliance-trestle/commit/32ae0e83b4d49a55316bb715575f83c64fc8e6aa)) + +* Merge branch 'develop' 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 'feature/samples-oscal-1.0.0-rc1' 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 'develop' 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't work for output. + +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 'develop' of https://github.com/IBM/compliance-trestle into feat/uuid_regen ([`f90ba17`](https://github.com/oscal-compass/compliance-trestle/commit/f90ba17e0c6d261a3a743cbf571da072aedcde73)) + +## v0.9.0 (2021-03-02) + +### 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 <chris@thebutlers.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 <chris@thebutlers.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 <chris@thebutlers.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 <chris@thebutlers.me> + +* fix:Constrain pydantic version + +Signed-off-by: Chris Butler <chris@thebutlers.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 'develop' into feature/remote ([`eca4236`](https://github.com/oscal-compass/compliance-trestle/commit/eca4236c5aec2d0cb70ce0c382bb769e74ed1309)) + +## v0.8.1 (2021-02-24) + +### 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 'feature/remote' of github.com:IBM/compliance-trestle into feature/remote +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`b3da0f1`](https://github.com/oscal-compass/compliance-trestle/commit/b3da0f1ab03664419ae3cd8fd250e5170eed00ef)) + +* Merge branch 'develop' 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 <chris@thebutlers.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 <chris@thebutlers.me> ([`a5510aa`](https://github.com/oscal-compass/compliance-trestle/commit/a5510aa786d4de26dfd2991f902ee420faae6e86)) + +* Merge branch 'develop' into feature/remote ([`20c793e`](https://github.com/oscal-compass/compliance-trestle/commit/20c793e8cf93c5624d249eaac17c53c3153ddc73)) + +## v0.8.0 (2021-02-22) + +### 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 <degenaro@us.ibm.com> + +* whoopsi - forgot to format & lint. + +Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> + +Co-authored-by: degenaro <degenaro@us.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.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 <degenaro@us.ibm.com> + +Co-authored-by: degenaro <degenaro@us.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.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 <degenaro@us.ibm.com> + +Co-authored-by: degenaro <degenaro@us.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`488a75a`](https://github.com/oscal-compass/compliance-trestle/commit/488a75a7fa5f259b2655b624ba7e3643c4ab7b28)) + +* feat: validate duplicates now loads distributed models (#346) + +Co-authored-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.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 <jeffetan@au1.ibm.com> ([`74223a1`](https://github.com/oscal-compass/compliance-trestle/commit/74223a18a7e4d81a55167d0237d0fb1f14d9385d)) + +* feat (remote): Linted. +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> ([`b9c4778`](https://github.com/oscal-compass/compliance-trestle/commit/b9c47781b7b8c8fcd49d64cbb3a6a2a678be9119)) + +* feat (remote): Updated test_https_fetcher() so a try block isn't included. +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> ([`663af76`](https://github.com/oscal-compass/compliance-trestle/commit/663af764627d36bc3c33f14186d25aafa980ea54)) + +* Merge branch 'feature/remote' of github.com:IBM/compliance-trestle into feature/remote +Chris merged develop into this more recently. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`90437e4`](https://github.com/oscal-compass/compliance-trestle/commit/90437e4b18ed59c8374cc331bd41a08f8f24d07a)) + +* Merge branch 'develop' 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 <chris@thebutlers.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.rubinstein@ibm.com> + +* trestle init now adds .keep files to preserve directory structure for git + +Signed-off-by: Juliet Rubinstein <juliet.rubinstein@ibm.com> + +* trestle init now adds .keep files to preserve directory structure for git + +Signed-off-by: Juliet Rubinstein <juliet.rubinstein@ibm.com> + +Co-authored-by: Chris Butler <chris@thebutlers.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 <jeffetan@au1.ibm.com> ([`c168922`](https://github.com/oscal-compass/compliance-trestle/commit/c1689223330d28c9487cde5337ea1a3a18e9883e)) + +* Merge branch 'develop' into feature/import-validate +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> ([`2a3b71f`](https://github.com/oscal-compass/compliance-trestle/commit/2a3b71f290077bef6e1247c8d29ec5d5eb78a7eb)) + +* feat (import): Linted. +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.ibm.com> ([`d5c6285`](https://github.com/oscal-compass/compliance-trestle/commit/d5c628509e871cf7b962b6ca36c497233fa1ec32)) + +* feat (remote): Can't handle relative paths properly on Windows just yet. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`d1632a7`](https://github.com/oscal-compass/compliance-trestle/commit/d1632a7636a8ab24d0303dfb2f5aa84077875c9e)) + +* feat (remote): code-format prefers one line. +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.ibm.com> ([`38d4a87`](https://github.com/oscal-compass/compliance-trestle/commit/38d4a8746a63eaeba3014282edbf542695fb3611)) + +* feat (remote): linted HTTPSFetcher tests. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`664da29`](https://github.com/oscal-compass/compliance-trestle/commit/664da29e91f38a7e9ae9a41888f4f4c1399d4758)) + +* feat (remote): improved get test for HTTPSFetcher. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`e4aec2c`](https://github.com/oscal-compass/compliance-trestle/commit/e4aec2cd848e5db39b7509ac70727cfac9c1fb34)) + +* feat (remote): get failure test for HTTPSFetcher. +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.ibm.com> ([`c8f8de7`](https://github.com/oscal-compass/compliance-trestle/commit/c8f8de79ceeb729511ca830fc60b7911de3128b4)) + +* feat (import): Updated nist submodules. +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> ([`f51023f`](https://github.com/oscal-compass/compliance-trestle/commit/f51023f078b993331c59ad561533e8211d8115ac)) + +* Merge branch 'develop' into feature/remote +Just to align this branch with recent updates in develop. +Signed-off-by: Jeff Tan <jeffetan@au1.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 <chris@thebutlers.me> ([`2694101`](https://github.com/oscal-compass/compliance-trestle/commit/2694101f4414446d5b1fae8b4218083379d7d2ea)) + +## v0.7.2 (2021-02-02) + +### 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 'make docs-serve' on linux (Red Hat 7.9) + +Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> + +* Updated to deal with inherently plural model names. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Fix merge main to back to develop automatically.(#332) + +* Corrected errors in the build process. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Corrected errors in the build process. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Nebula Alam <anebula@au1.ibm.com> +Co-authored-by: degenaro <degenaro@us.ibm.com> ([`74df375`](https://github.com/oscal-compass/compliance-trestle/commit/74df375c15ad0bc2f0fb8c54e1ed83faf11d66e4)) + +### Unknown + +* Merge branch 'main' into develop ([`59b9945`](https://github.com/oscal-compass/compliance-trestle/commit/59b994536fa7ffe78498bfa4b17bf0d4943c970a)) + +## v0.7.1 (2021-02-02) + +### Fix + +* fix: Assembly behaviour correction and devops fixes. + +* Implemented trestle assemble with some UT + +* Modified docs + +* Code format + +* Code lint + +* Extending UT + +* Full UT + +* assemble bug fix + +* fix 'make docs-serve' on linux (Red Hat 7.9) + +Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> + +* Updated to deal with inherently plural model names. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Nebula Alam <anebula@au1.ibm.com> +Co-authored-by: degenaro <degenaro@us.ibm.com> ([`ac3828d`](https://github.com/oscal-compass/compliance-trestle/commit/ac3828de66874807b70ee372be51976a724322d1)) + +* fix: Fix merge main to back to develop automatically.(#332) + +* Corrected errors in the build process. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Corrected errors in the build process. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`b64dd9f`](https://github.com/oscal-compass/compliance-trestle/commit/b64dd9f5d1183109fe18bd3a75f5953af269d985)) + +### Unknown + +* Merge branch 'main' into develop ([`31e0ac5`](https://github.com/oscal-compass/compliance-trestle/commit/31e0ac5c1ae956140b38d2a7f1b1961a93dd707c)) + +## v0.7.0 (2021-01-28) + +### Fix + +* fix: Corrected assemble to push files into the correct location. ([`f3bc0e5`](https://github.com/oscal-compass/compliance-trestle/commit/f3bc0e5df22430d396ca0d82bc70624db34a6986)) + +### Unknown + +* Release of trestle of assembly and osco-to-oscal. + +feat: Release of assembly, osco-to-oscal and other tasks ([`a56c546`](https://github.com/oscal-compass/compliance-trestle/commit/a56c54683ca8ac938f1fc2af787db34f852a9a44)) + +* Merge branch 'develop' into feat/assemble ([`44d884e`](https://github.com/oscal-compass/compliance-trestle/commit/44d884e0fd9ddd4e207f54dde3ae684c80d4eb96)) + +* fix:Correct casing in mkdocs serve to work on case sensitive file sytems. + +fix 'make docs-serve' on linux (Red Hat 7.9) ([`a2949e1`](https://github.com/oscal-compass/compliance-trestle/commit/a2949e15b79bfc8ee13dd9822aa49e708548c62d)) + +* fix 'make docs-serve' on linux (Red Hat 7.9) + +Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> ([`28e5fc0`](https://github.com/oscal-compass/compliance-trestle/commit/28e5fc048bafdec4d42d6e2d838df41f83179189)) + +* Updated to deal with inherently plural model names. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`3404043`](https://github.com/oscal-compass/compliance-trestle/commit/34040437cd9b26361934ad24e89926264bb137c6)) + +* Merge develop ([`d0b2d26`](https://github.com/oscal-compass/compliance-trestle/commit/d0b2d26c0fd81d13e904b95e162e1279747ad517)) + +* Merge branch 'main' into develop ([`0a4e9c7`](https://github.com/oscal-compass/compliance-trestle/commit/0a4e9c7577576597fa70e1e21abe5d579f155387)) + +## v0.6.2 (2021-01-17) + +### Chore + +* chore: Updated bad documentation. (#317) + +* Corrected bad link for website homepage. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Typo corrections in documentation website + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`b5a58f7`](https://github.com/oscal-compass/compliance-trestle/commit/b5a58f71ba1bd7f6a89bb5626999ab8ee6a0049a)) + +* chore: Auto-update pre-commit hooks (#312) + +Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> ([`0c6c748`](https://github.com/oscal-compass/compliance-trestle/commit/0c6c7487aa26e6666511ec159e35e41e7052db95)) + +### Documentation + +* docs: Fix typos and grammar in cli and misspelling in split_merge docs (#306) ([`272c2cc`](https://github.com/oscal-compass/compliance-trestle/commit/272c2ccf6fbfca5fe6cdac7f0623b85fa8d5ddd7)) + +### Feature + +* feat: trestle assemble implemented and documented. + +* Implemented trestle assemble with some UT + +* Modified docs + +* Code format + +* Code lint + +* Extending UT + +* Full UT + +Co-authored-by: Nebula Alam <anebula@au1.ibm.com> ([`e752bc2`](https://github.com/oscal-compass/compliance-trestle/commit/e752bc2a6923c05c6251622499137d0c40633467)) + +* feat: Enhancement to handle arboretum fetcher-built OSCO evidence as input (#311) + +Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> + +Co-authored-by: degenaro <degenaro@us.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`e9c4196`](https://github.com/oscal-compass/compliance-trestle/commit/e9c41969597c6bf587b5732e0851da3e7b24429e)) + +* feat: task osco-to-oscal to allow transformation from OpenSHift Compliance Operator to OSCAL (#296) + +* task osco-to-oscal + +Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> + +* Fixes to address review by Chris Butler. + +- move AssessmentResultsPartial class into osco.py +- fix wacky typing +- fix function/class variable annotations +- fix OSCAL object initialization +- fix awkward while true construct +- use tmp_path +- remove extraneous import + +Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> + +* Fixes to address PR comments from CB. + +Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> + +* Remedy the metadata cluster-X info concern. + +Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> + +* output file reduced to observations list only & improved test cases. + +Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> + +* oops, missed a return type. + +Signed-off-by: Lou Degenaro <degenaro@us.ibm.com> + +Co-authored-by: degenaro <degenaro@us.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`ad995a2`](https://github.com/oscal-compass/compliance-trestle/commit/ad995a22029aa67972bc9e6fdd3ebd0e987f50ba)) + +* feat: Merge allows use of both yaml and json files. + +Co-authored-by: Nebula Alam <anebula@au1.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`4d87e6a`](https://github.com/oscal-compass/compliance-trestle/commit/4d87e6aac5a49d1624da06d4f7bab4accb13b033)) + +### Fix + +* fix: Corrected branch for mkdocs deploy. (#304) (#305) + +Note: Alternative techniques may be required, however, with devops integration it must be tested live. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`be3f13a`](https://github.com/oscal-compass/compliance-trestle/commit/be3f13a89d44c3f773ad7e372e4116eb609c8f5d)) + +* fix: Corrected bad link to website homepage. (#314) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`81124fb`](https://github.com/oscal-compass/compliance-trestle/commit/81124fba5f25772cbcabf3fd0923ac6284794ff1)) + +### Unknown + +* assemble bug fix ([`fcbbfd2`](https://github.com/oscal-compass/compliance-trestle/commit/fcbbfd2127c9bab2ac07fafd4b8ff4a9fe85e804)) + +* Full UT ([`f90c351`](https://github.com/oscal-compass/compliance-trestle/commit/f90c3512f466c9ea3cd5cca6290c1b6f288046c0)) + +* Merge branch 'develop' into feat/assemble ([`963e9b9`](https://github.com/oscal-compass/compliance-trestle/commit/963e9b967d87404cedca959f5f05eeae260fc567)) + +* Extending UT ([`3662b83`](https://github.com/oscal-compass/compliance-trestle/commit/3662b83a660eed4c1f14eb864afd20b04633be19)) + +* Code lint ([`d0c8e84`](https://github.com/oscal-compass/compliance-trestle/commit/d0c8e847dd4a13cc7993e86fe567d43a021db6a6)) + +* Code format ([`9a9235f`](https://github.com/oscal-compass/compliance-trestle/commit/9a9235ff62735bd300ad41b9c24945517d276cd0)) + +* Modified docs ([`ff49c03`](https://github.com/oscal-compass/compliance-trestle/commit/ff49c03a762abd1ea2fc54d69e2a93e576e07318)) + +* Merge branch 'develop' into feat/assemble ([`71b0497`](https://github.com/oscal-compass/compliance-trestle/commit/71b04976a7b35403a61e750ff4ea5c30995d9934)) + +* Implemented trestle assemble with some UT ([`cc02d70`](https://github.com/oscal-compass/compliance-trestle/commit/cc02d70febe86e6b1579f40c323a92637b3b1a8d)) + +* feat (remote): testing local fetcher get_oscal() and get_raw(), and code format/lint fixes. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`05a1e04`](https://github.com/oscal-compass/compliance-trestle/commit/05a1e04c8afabda3e266d1fa97e02060b94b5db8)) + +* feat (remote): updated get_oscal() and get_raw() to adjust to proper treatment of _inst_cache_path as full paths to the cache object +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`df886e0`](https://github.com/oscal-compass/compliance-trestle/commit/df886e04a3c2dfbf8f530bfe075ecab155db1148)) + +* feat (remote): local and sftp fetchers now treat _inst_cache_path as full paths to the cache object, rather than the containing directory. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`c43292e`](https://github.com/oscal-compass/compliance-trestle/commit/c43292ee879cfe4f29fe45cd2d7f9cd23fa7559d)) + +* feat (remote): merge resolution: sftp tests. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`e2a387d`](https://github.com/oscal-compass/compliance-trestle/commit/e2a387df314a729058562e96bc5dca181ce3adb7)) + +* feat (remote): Fixed some unit tests, and linted. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`83de1bc`](https://github.com/oscal-compass/compliance-trestle/commit/83de1bcd57e279e540452802f84eb28da5d1da0d)) + +* feat (remote): More sftp fetcher unit tests. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`0b3ede0`](https://github.com/oscal-compass/compliance-trestle/commit/0b3ede0bd0e7e0d8cc233433aa9d70dc7e691155)) + +* feat (remote): Removed unnecessary mkdir success check for subdirectory inside _trestle_cache_path, which would have been created successfully previously via __init__. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`8f5f66b`](https://github.com/oscal-compass/compliance-trestle/commit/8f5f66b4e35c58f2d69a8de5c524b110278816be)) + +* feat (remote): linting and improving test code. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`bef5013`](https://github.com/oscal-compass/compliance-trestle/commit/bef50133da6c306934ef8c1b8cfb5158ae2e1448)) + +* feat (remote): merging get_oscal and tests in. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`de5bf83`](https://github.com/oscal-compass/compliance-trestle/commit/de5bf83c02f415ad06777993399121119d22ed83)) + +* feat (remote): cleaned up: get_oscal() doesn't need JSONDecodeError. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`b84a5d1`](https://github.com/oscal-compass/compliance-trestle/commit/b84a5d17275ed8654c043a4a303a3017712cd063)) + +* feat (remote): get_oscal() implemented and tested, with limited linting. However, yapf did include other parts beyond get_oscal() code for both cache.py and cache_test.py +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`d71607c`](https://github.com/oscal-compass/compliance-trestle/commit/d71607c447d181a74600b84cea1ac1fff1d125eb)) + +* feat (remote): cleaned up commented region. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`a73bed1`](https://github.com/oscal-compass/compliance-trestle/commit/a73bed1806db0d85487ce10b5df946077a243396)) + +* feat (remote): Removed unused import. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`6f3a2c7`](https://github.com/oscal-compass/compliance-trestle/commit/6f3a2c72a9e0cf868a9fd4175252c957d8d2054f)) + +* feat (remote): Implemented base class get_raw() method with on unit tests using local fetcher. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`7abf6a7`](https://github.com/oscal-compass/compliance-trestle/commit/7abf6a7c2a947d8b4043002655bdfdef5e6b87db)) + +* feature (remote): Fixed settings.py being inside main_test.py... ([`3dfe3b9`](https://github.com/oscal-compass/compliance-trestle/commit/3dfe3b91c049c9c69daede44b4a7fec1c398a458)) + +* Merge branch 'main' into develop ([`0411969`](https://github.com/oscal-compass/compliance-trestle/commit/04119696cf646b15b3aed0933eaae95923f3af0e)) + +## v0.6.1 (2021-01-15) + +### Chore + +* chore: Updated UTs more 100% coverage (#302) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e77fda3`](https://github.com/oscal-compass/compliance-trestle/commit/e77fda329924230f70a18b34b63011d882ed6297)) + +* chore: Make fix_any deterministic in output generation (#300) + +also added full coverage for snake and camel tests ([`c66292e`](https://github.com/oscal-compass/compliance-trestle/commit/c66292ece62dde1aa3df5857b890d543ee99add1)) + +* chore: Auto-update pre-commit hooks (#299) + +Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> ([`cf83024`](https://github.com/oscal-compass/compliance-trestle/commit/cf83024629b3588891273c5bdcee57d47b2e9a7c)) + +### Fix + +* fix: Corrected branch for mkdocs deploy. (#304) + +Note: Alternative techniques may be required, however, with devops integration it must be tested live. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`2dd5d93`](https://github.com/oscal-compass/compliance-trestle/commit/2dd5d93df759f9bde345ca1f8d59014d8eb15787)) + +* fix: Extra unit tests and cleanup to close more significant gaps (#298) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`2abcaad`](https://github.com/oscal-compass/compliance-trestle/commit/2abcaadc1bc14419111e1778bbb1fab61d633d5e)) + +### Unknown + +* Documentation website up and running. (#297) + +Minor release: Documentation website up and running. ([`1f8b364`](https://github.com/oscal-compass/compliance-trestle/commit/1f8b364f534131678e74c05538d7db79efe5aabe)) + +* Merge branch 'main' into develop ([`b984828`](https://github.com/oscal-compass/compliance-trestle/commit/b98482828d085c0ba796522b27a75c9162f86871)) + +## v0.6.0 (2021-01-07) + +### 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 <chris@thebutlers.me> + +* Corrected typos in PR template. + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`72539c9`](https://github.com/oscal-compass/compliance-trestle/commit/72539c956be59422056bdb82143772587a9f5f05)) + +* chore: Add mdformat-gfm to setup.cfg (#292) + +Signed-off-by: Taneli Hukkinen <hukkinj1@users.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 <hukkinj1@users.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 <chris@thebutlers.me> + +* Fixes missing deploy script + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* More updates to the documentation website. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated contributing documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Pre-merge commit + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Precommit update test. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated documentation for basemodel + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added missing docs files + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Fixing mdformatting issues with include + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added more api docs pages + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Fix gitignore to cover html coverage website. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Fix gitignore to cover html coverage website. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updates + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Corrected poorly formatted links. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Improvements in documentation build process. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Basic documentation website setup complete. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* docs/cli.md + +Co-authored-by: Nebula Alam <anebula@au1.ibm.com> ([`a51081b`](https://github.com/oscal-compass/compliance-trestle/commit/a51081bd93cb43b02135b72f00e16cf805eacba9)) + +### Feature + +* feat: Force update of version + +Version failed due to migration to 'main' 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 <chris@thebutlers.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 <chris@thebutlers.me> + +* Various updates including support for conint. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Various updates including support for conint. + +Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.me> + +* Various updates including support for conint. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Various updates including support for conint. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated generators to deal with new corner case where field is List[NonOscaObject] + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Cleanup fix_any. now 17 fail and 148 pass + +* Updates with 12 open UT's (#282) + +* Updated get_origin and other calls to ensure constrained lists are handled. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Various updates including support for conint. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Various updates including support for conint. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated generators to deal with new corner case where field is List[NonOscaObject] + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Update to ensure validator passes. Refactored some yaml examples to do so. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* More test fixes + +Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.me> + +* Various updates including support for conint. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Various updates including support for conint. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated generators to deal with new corner case where field is List[NonOscaObject] + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Update to ensure validator passes. Refactored some yaml examples to do so. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* More test fixes + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Corrected more UT's to new OSCAL models. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Corrected more UT's to new OSCAL models. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated unit tests for oscal 1.0.0rc + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated unit tests for oscal 1.0.0rc with corrected behaviour. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated documentation. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added pytest-random-order to dependencies. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Stripped out unused functions to boost test coverage. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: FrankSuits <frankst@au1.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 "Format and lint" + +This reverts commit 73ef3c83d9f5a4d071f7a422556a420d781b1306. + +* Revert "Restoring phantom changes from develop" + +This reverts commit a2b695e8dcce2b4a802438a726aabc0e0e1b8d80. + +* Revert "Restoring phantom changes from develop" + +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 <brunomar@au1.ibm.com> +Co-authored-by: Nebula Alam <anebula@au1.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 <chris@thebutlers.me> + +* feat: Updating to btest compatibility with python 3.9 + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Removed depricated "warn" function from use + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Update to clean up unit tests. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* More typing coverage. + +Signed-off-by: Chris Butler <chris@thebutlers.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 <anebula@au1.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 <chris@thebutlers.me> + +* Altered unit test to only use pytest inbuilt temporary directories. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Adding more typing and clearing up redundant functionality. + +Signed-off-by: Chris Butler <chris@thebutlers.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 'main' 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 <chris@thebutlers.me> ([`c147e94`](https://github.com/oscal-compass/compliance-trestle/commit/c147e9443993c37bb484a925e4a10c195c1eb1cd)) + +* Merge branch 'main' 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 'main' 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 'develop' 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 <jeffetan@au1.ibm.com> ([`98aabdb`](https://github.com/oscal-compass/compliance-trestle/commit/98aabdbe643d958dcaac00f9c2ff4804e2cb7c93)) + +* Fixed a few typos. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`474f693`](https://github.com/oscal-compass/compliance-trestle/commit/474f693e56878fb1d5716a42aad09b3bdf4f0fcc)) + +* Fixed table. +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.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 <jeffetan@au1.ibm.com> ([`80f2b8d`](https://github.com/oscal-compass/compliance-trestle/commit/80f2b8d50f72e3ed6e1fee3d2b45719a5448c269)) + +* feat (remote): Adjustments for Windows environment. +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.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'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 <jeffetan@au1.ibm.com> ([`360835a`](https://github.com/oscal-compass/compliance-trestle/commit/360835a7209712a67c3dd90e47e327a8478f2bcc)) + +* feat (remote): Adopting trestle.utils.fs +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> ([`4712eff`](https://github.com/oscal-compass/compliance-trestle/commit/4712effe78e36eb04d9568eb0634744d6949eabb)) + +* Merge branch 'develop' into feature/remote +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> ([`b2d3dc4`](https://github.com/oscal-compass/compliance-trestle/commit/b2d3dc4f9664c22d60d14a96975d2fc6d4fdd1c8)) + +* Merge branch 'main' into develop ([`0b0b6c4`](https://github.com/oscal-compass/compliance-trestle/commit/0b0b6c4a3dad51bdce921099906347abc0a4d7df)) + +## v0.4.0 (2020-11-24) + +### Chore + +* chore: Remove references to master branch and run releases off of "main" (#259) + +* Remove references to master branch and run releases off of "main" + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Corrected broken github header. + +Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.me> + +* Initial trestle create + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added UT file + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added main file to allow running as "python -m trestle" + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Commit to allow merging + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Cleaned and as expected UT failures after merge + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated such that all models can generate + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added unit tests for generators. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Ready for review + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Fixed merge error + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Refactored init to use pathlib where possible + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* chore: Refactored init to use pathlib where possible + +Signed-off-by: Chris Butler <chris@thebutlers.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 <jeffetan@au1.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 <jeffetan@au1.ibm.com> + +* Added argument and return types. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* Anticipating TrestleError or some specific error in try blocks now. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* Linted. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* Fixed error logs for clarity. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* Simplified unnecessary try blocks with assertion on return code. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* Added a test for attempting to import a non-top level element. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* Linting. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* Tightened testing around just _run() for most tests, and cleaned up testing code comments. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* Added exception handler for file PermissionError. +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> + +* Unnecessary str(). +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* Linting. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* Removing tempfile from test_import_cmd. +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* Linted. +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> + +* Testing load file failures through mocks. Added JSONDecodeError handler in import code. +Signed-off-by: Jeff Tan <jeffetan@au1.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 <jeffetan@au1.ibm.com> + +* sample minimal catalog used in trestle remove testing + +Signed-off-by: Jeff Tan <jeffetan@au1.ibm.com> + +* Handling errors without messy exit. Using logger instead of warnings. +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* Type hints for the return valies added. +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* Handling errors arising from file arg. +Signed-off-by: Jeff Tan <jefferson.tan@gmail.com> + +* Corrected log text. +Signed-off-by: Jeff Tan <jefferson.tan@gmail.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.tan@gmail.com> + +* Now covering 100%, tests response to failure of add_plan.execute(). +Signed-off-by: Jeff Tan <jefferson.tan@gmail.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 <chris@thebutlers.me> + +* Added UT file + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added main file to allow running as "python -m trestle" + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Commit to allow merging + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Cleaned and as expected UT failures after merge + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated such that all models can generate + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added unit tests for generators. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Ready for review + +Signed-off-by: Chris Butler <chris@thebutlers.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.tan@gmail.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 <anebula@au1.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.me> ([`c382cb5`](https://github.com/oscal-compass/compliance-trestle/commit/c382cb593bf8b2f2b69810650320fdea544ed803)) + +* fix: Refactor to adopt FileContentType consistently (#223) + +Signed-off-by: Chris Butler <chris@thebutlers.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 'develop' 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 <chris@thebutlers.me> + +* Additional details for tasks. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Initial implementation of trestle tasks. To be thoroughly tested. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Initial implementation of trestle tasks. To be thoroughly tested. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Stuff. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Altered logging behaviour to use improved logger. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Corrected unit tests + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Ready for merge - first trestle tasks. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Merged in removed and updated with appropriate logging changes + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Corrected behaviour. + +Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.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 <anebula@au1.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`f33eeda`](https://github.com/oscal-compass/compliance-trestle/commit/f33eeda6bf83c43269175fa03bbab4dddce4a87a)) + +* Added test skeleton + +Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.me> ([`d01dfb5`](https://github.com/oscal-compass/compliance-trestle/commit/d01dfb5f3991701cb06a1f7735d94aba8fa5e98e)) + +* Merge branch 'master' into develop ([`a99b19c`](https://github.com/oscal-compass/compliance-trestle/commit/a99b19c096322e94d24977572691ca4a8c927251)) + +## v0.3.0 (2020-10-26) + +### 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 <chris@thebutlers.me> + +* Added tests for interface and cleaned up code formatting + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated interface name to better reflect funcionality. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated unit tests to correct for name change. + +Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.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 <chris@thebutlers.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 <anebula@au1.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 <chris@thebutlers.me> ([`40adb2d`](https://github.com/oscal-compass/compliance-trestle/commit/40adb2d9a7c9ee06de86d39c9490d867bc8198d3)) + +* chore: Add github static analysis (#153) + +Co-authored-by: Bruno <bruno.assis.marques@gmail.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 <chris@thebutlers.me> + +* docs: Updated developer docs with workflow and DCO both requirements. + +Signed-off-by: Chris Butler <chris@thebutlers.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 <chris@thebutlers.me> + +* Updated caching documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated caching documentation + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Bruno <bruno.assis.marques@gmail.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 <chris@thebutlers.me> + +Co-authored-by: Bruno <bruno.assis.marques@gmail.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 <brunomar@au1.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 <anebula@au1.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 <chris@thebutlers.me> ([`957fe0b`](https://github.com/oscal-compass/compliance-trestle/commit/957fe0bf08a358e5ab21eb93c60dba65cc486b24)) + +* fix: Versioning tag was malformed. (#199) + +Signed-off-by: Chris Butler <chris@thebutlers.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.mehedy@au1.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.mehedy@au1.ibm.com> ([`6b18237`](https://github.com/oscal-compass/compliance-trestle/commit/6b18237fda53f91f936fc122fdbf74da8e4db65e)) + +* fix: reference to inexistent function (#182) + +Signed-off-by: Bruno <brunomar@au1.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'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 <brunomar@au1.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 <chris@thebutlers.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 <chris@thebutlers.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 <brunomar@au1.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 <anebula@au1.ibm.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`bcbdae8`](https://github.com/oscal-compass/compliance-trestle/commit/bcbdae86a9ec8844208d9368b8b48429ed25c3ed)) + +* Merge branch 'master' 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) + +/docs/assets/Canonical_trestle_auditree_workflows.png -- 236.06kb -> 158.11kb (33.02%) + +Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com> + +Co-authored-by: ImgBotApp <ImgBotHelp@gmail.com> +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`ad238c8`](https://github.com/oscal-compass/compliance-trestle/commit/ad238c84b5999f1c650109f7e61b276faf4d1b53)) + +* feature: introducing mandatory mypy typing. (#174) + +* Basic mypy setup + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added code typing support to build pipeline checks + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Partial completion of mypy first pass. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated get_stripped_contextual_model + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Partial update towards zero mypy errors + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* updates + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Altered cicd to be permissive + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Altered cicd to be permissive + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Fixed UT's related to split + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated mypy conf to be a balanced severity + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ebde8e5`](https://github.com/oscal-compass/compliance-trestle/commit/ebde8e546bb5d3cb4ddb27f60b4ca0cbcd52f9c5)) + +* Feature/validate intra (#188) + +* 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'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 + +* refactored + +* finalized dup uuid validation with doc + +* get alias from class + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`b4b7090`](https://github.com/oscal-compass/compliance-trestle/commit/b4b709059b35f1b33860bec89c9aa5ecc836ec9c)) + +* feature: implement trestle trash and RemovePathAction #69 (#186) + +* refactor: create trestle trash util module + +* feature: implement move_dir_to_trash and tests + +* feature: more functionalities in trestle trash module + +* feature: unit tests for trash recovery methods + +* feature: implement RemovePathAction ([`bcd19b5`](https://github.com/oscal-compass/compliance-trestle/commit/bcd19b561ce40af78fd9d95ff3cc17b782e37a3c)) + +* Merge pull request #171 from IBM/fix/sub_model_split_154 + +fix: subsequent sub model split #154 ([`02bc9e1`](https://github.com/oscal-compass/compliance-trestle/commit/02bc9e16be9d721ce372ecd308374a9509443451)) + +* Implement unit test and improve coverage #172 ([`10a441f`](https://github.com/oscal-compass/compliance-trestle/commit/10a441f68b68ac0982fde6330789f0df46330c43)) + +* remove unused function ([`561c430`](https://github.com/oscal-compass/compliance-trestle/commit/561c4304d6583a38e416ccab91123de5178c321f)) + +* Split should support chained element paths for multi-level split #172 ([`4e25e4f`](https://github.com/oscal-compass/compliance-trestle/commit/4e25e4f7cc0a50f17beab4cb8bcdaf12ca956c45)) + +* Merge branch 'develop' into fix/sub_model_split_154 ([`4e8bb8c`](https://github.com/oscal-compass/compliance-trestle/commit/4e8bb8c135dc77a69b530970957b03c4220b5bd5)) + +* Stop generation of timestamp in oscal files, import conlist as needed, fix regex strings (#173) ([`c731c33`](https://github.com/oscal-compass/compliance-trestle/commit/c731c336edab83ff888b399be0a5f0f891d0528d)) + +* only support split of first level childrent of a model ([`ef933d0`](https://github.com/oscal-compass/compliance-trestle/commit/ef933d0c0beec7c1c5f056004c6b241fe6c38ef2)) + +* add fixture for sample catalog and split unit test for catalog model ([`c923a99`](https://github.com/oscal-compass/compliance-trestle/commit/c923a998c5c75cc274bb0483b1f887b4a0da6351)) + +* refactor split tests ([`84bcd9f`](https://github.com/oscal-compass/compliance-trestle/commit/84bcd9f239a3a05caa709de5113deccb685f3c58)) + +* fix unit tests ([`0d9bc0d`](https://github.com/oscal-compass/compliance-trestle/commit/0d9bc0d997734ce0824bba2bb44a0aa0b145c79b)) + +* Merge branch 'develop' into fix/sub_model_split_154 ([`bc912ce`](https://github.com/oscal-compass/compliance-trestle/commit/bc912ce091aaaabcf6a8bd259a4fd1248b4f95ae)) + +* Merge pull request #160 from IBM/feature/clear_content_159 + +CreatePathAction should have an option to clean the content of a file if it exists #159 ([`19018e2`](https://github.com/oscal-compass/compliance-trestle/commit/19018e2c1cd969887d08bf79805f9382ac32e14d)) + +* Add unit test for directory ([`1338b1f`](https://github.com/oscal-compass/compliance-trestle/commit/1338b1fc4c2232ec6cfb1d0bcf5d177a46dcd1c7)) + +* Include an option to clear content in CreatePathAction + +https://github.com/IBM/compliance-trestle/issues/159 ([`f31a800`](https://github.com/oscal-compass/compliance-trestle/commit/f31a8007c311784ce914811ff0e9ef70eb1e6438)) + +* Merge branch 'develop' into fix/issue_149b ([`24a51f3`](https://github.com/oscal-compass/compliance-trestle/commit/24a51f380be2aedcde397b45dbcccda37cfb000a)) + +* Merge pull request #157 from IBM/master + +Master ([`84e8882`](https://github.com/oscal-compass/compliance-trestle/commit/84e8882bfce7a82be75ec60aea35cdcc0ac187f9)) + +## v0.2.2 (2020-10-15) + +### 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)) + +## v0.2.1 (2020-10-14) + +### 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)) + +## v0.2.0 (2020-10-12) + +### Documentation + +* docs: Update readme to reflect alpha status. (#134) + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`8ef9762`](https://github.com/oscal-compass/compliance-trestle/commit/8ef9762ccb015d3a5e2b5c3e9d119e7cbca76c43)) + +### Fix -* Each element path must have its root model as the path prefix ([`e1cf697`](https://github.com/oscal-compass/compliance-trestle/commit/e1cf69767a015ac657b8c9fa17e810eeea60e019)) +* fix: Coding formating failure on merge from master + +Signed-off-by: Chris Butler <chris@thebutlers.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 <brunomar@au1.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 'develop' 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'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 <chris@thebutlers.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.mehedy@au1.ibm.com> ([`c3b292f`](https://github.com/oscal-compass/compliance-trestle/commit/c3b292fe4deeeed1ebcd765d7e6777b8eb08fdfd)) * Merge pull request #131 from IBM/enhancement/5c @@ -14752,291 +15231,364 @@ From develop, fix_any.py now adds a license header to output files. ([`4aaa89d`] * Merge branch 'develop' into enhancement/5c ([`c0fe5f0`](https://github.com/oscal-compass/compliance-trestle/commit/c0fe5f00626d0b64c026ab31d24d45d3e0af8836)) +* Merge branch 'develop' 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 <brunomar@au1.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 'feature/split_merge_add' 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 'feature/split_merge_add' 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 <brunomar@au1.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 'develop' into enhancement/5c ([`55230a7`](https://github.com/oscal-compass/compliance-trestle/commit/55230a7a5870c1f2596eac8c0757002fc8f68ce8)) +* Merge branch 'develop' into feature/split_merge_add ([`7800622`](https://github.com/oscal-compass/compliance-trestle/commit/7800622a537a6b882b66a3859fac72b048e0d95a)) -* Merge branch 'feature/split_merge_add' into feature/split-cmd ([`c90533c`](https://github.com/oscal-compass/compliance-trestle/commit/c90533c873768e7b49edbadc932c59d9a32690bd)) +* Implement multi-level recursive split ([`dac9e3e`](https://github.com/oscal-compass/compliance-trestle/commit/dac9e3e546eb135dbcff678b49ae33cdc734794c)) -* Merge branch 'develop' into feature/split_merge_add ([`7800622`](https://github.com/oscal-compass/compliance-trestle/commit/7800622a537a6b882b66a3859fac72b048e0d95a)) +* Each element path must have its root model as the path prefix ([`e1cf697`](https://github.com/oscal-compass/compliance-trestle/commit/e1cf69767a015ac657b8c9fa17e810eeea60e019)) + +* Merge branch 'feature/split_merge_add' 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 'master' into develop ([`863ad75`](https://github.com/oscal-compass/compliance-trestle/commit/863ad75637c31de19908847d8a671e45d8beb084)) -## v0.2.0 (2020-10-12) +## v0.1.1 (2020-10-05) + +### Fix + +* fix: Corrected typing of parameter-settings in profile and ssp (#97) + +* fix: Corrected typing of parameter-settings in profile. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added error which was missed in original hotfix + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9a5ef55`](https://github.com/oscal-compass/compliance-trestle/commit/9a5ef55d9d504f3e32b73277f116172e05281081)) + +### Unknown + +* Correcting missed pre-commit change that broke build process. (#102) + +Signed-off-by: Nebula Alam <anebula@au1.ibm.com> ([`7c1820d`](https://github.com/oscal-compass/compliance-trestle/commit/7c1820dbfdd23c3ca0ed592b369a69f056b81c3f)) + +## v0.1.0 (2020-09-23) ### Chore * chore: Depricating methods and adding unit tests. -Deprecated parser methods which are being replaced by methods inside of OscalBaseModel. Extra methods added to utils. - +Deprecated parser methods which are being replaced by methods inside of OscalBaseModel. Extra methods added to utils. + Signed-off-by: Chris Butler <chris@thebutlers.me> ([`0fd0d45`](https://github.com/oscal-compass/compliance-trestle/commit/0fd0d4536550d08b5639c9fe511acc30694c2056)) +* chore: Add windows support to CICD and associated test + + + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`b6f2203`](https://github.com/oscal-compass/compliance-trestle/commit/b6f2203c175d12a1820047ff310077ea27b1c983)) + ### Documentation -* docs: Update readme to reflect alpha status. (#134) +* docs: Updated documentation with a short description of target (#90) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`8ef9762`](https://github.com/oscal-compass/compliance-trestle/commit/8ef9762ccb015d3a5e2b5c3e9d119e7cbca76c43)) +* Updated documentation with a short description of target + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`bcd20dc`](https://github.com/oscal-compass/compliance-trestle/commit/bcd20dc0d117835347f9b9ee736ae4106fe12326)) ### Feature +* feat: Merge pull request #65 from IBM/develop + +Releasing trestle init along with updated object model. ([`0f8b637`](https://github.com/oscal-compass/compliance-trestle/commit/0f8b637d897689450907eca4e7add1dda2016dcd)) + * feat: Windows support declared for trestle (#88) -* Updating setup.cfg to cover windows support and other classifier flags from trove - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Corrected typo which snuck into build. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - +* Updating setup.cfg to cover windows support and other classifier flags from trove + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Corrected typo which snuck into build. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + Co-authored-by: NEBULA ALAM <nebula.alam@gmail.com> ([`56bdfa2`](https://github.com/oscal-compass/compliance-trestle/commit/56bdfa2b7e3d7365b516d79beae1ec2a2d0855e0)) ### Fix -* fix: Coding formating failure on merge from master +* fix: Fix forward references caused by fix_any.py issue #108 (#111) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`3e00d5d`](https://github.com/oscal-compass/compliance-trestle/commit/3e00d5d76e2fd3018604b4f88a8bd83d07b35f60)) +* Initial implementation of has_no_duplicate_elements -* fix: Fix forward references caused by fix_any.py issue #108 (#111) +* renamed find_values_by_name_generic to convey not just pydantic objects -* 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'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 - -* Allow escape sequences for regex - -* Fix forward references caused by fix_any.py ([`447a6ab`](https://github.com/oscal-compass/compliance-trestle/commit/447a6aba592eba8934a3aa477e48bd409b18cdd4)) +* Simplify parsing tests and use new read/write oscal methods -### Unknown +* Manually edit duplicate uuid's -* Regenerated models in trestle/oscal/ ([`31c9382`](https://github.com/oscal-compass/compliance-trestle/commit/31c9382cab3291b81e1fcd2f507e3603b47ba588)) +* add tests for duplicate uuids -* Merge pull request #129 from IBM/develop +* added tools and tests to find duplicate values of specified pydantic type -Release to master ([`e164c3d`](https://github.com/oscal-compass/compliance-trestle/commit/e164c3dc331c6b1abe6daf60de55276ab1e56b8a)) +* better naming of test files and edited uuids -* Fixed missing newlines for copyright text. ([`e4ffad6`](https://github.com/oscal-compass/compliance-trestle/commit/e4ffad6bb0ddee292a75e7358426f4e1ed687ad3)) +* better implementation of get_values_by_name using fields_set -* From develop, fix_any.py now adds a license header to output files. ([`ce4806d`](https://github.com/oscal-compass/compliance-trestle/commit/ce4806d80319fee334e395b7c31e5727806af3ab)) +* Prepare for cli validation -* Merge branch 'master' into develop ([`863ad75`](https://github.com/oscal-compass/compliance-trestle/commit/863ad75637c31de19908847d8a671e45d8beb084)) +* Allow escape sequences for regex + +* Fix forward references caused by fix_any.py ([`447a6ab`](https://github.com/oscal-compass/compliance-trestle/commit/447a6aba592eba8934a3aa477e48bd409b18cdd4)) + +### Unknown + +* Edit and proofread README and CONTRIBUTING (#106) + +* Edit and proofread README and CONTRIBUTING + +* fixed typo implicitly + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`6473d92`](https://github.com/oscal-compass/compliance-trestle/commit/6473d9216af4f6a791332c3a3ac6abbd09bb0848)) * utils.py cleanup (#127) -* remove contextual functions from utils.py - +* remove contextual functions from utils.py + Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`7bcee56`](https://github.com/oscal-compass/compliance-trestle/commit/7bcee5654814ba38af99970e75b0b04f1f6b11b9)) * utils.py cleanup (#123) -* move functions to core/utils to solve circular dependencies - -* move functions to core/utils to solve circular dependencies - -* initial list of contextual_path is not mandatory - -* make initial list of get_contextual_path function not mandatory - -* add unit tests for a few utils functions - -* implement get_contextual_model_type - -* remove get_fields_by_alias and alias_to_fields_map duplication - +* move functions to core/utils to solve circular dependencies + +* move functions to core/utils to solve circular dependencies + +* initial list of contextual_path is not mandatory + +* make initial list of get_contextual_path function not mandatory + +* add unit tests for a few utils functions + +* implement get_contextual_model_type + +* remove get_fields_by_alias and alias_to_fields_map duplication + Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`f8cf921`](https://github.com/oscal-compass/compliance-trestle/commit/f8cf9213d95b79c7c2f00c2722245a9275e3a94e)) * Merge branch 'feature/split_merge_add' into feature/split-cmd ([`49015cb`](https://github.com/oscal-compass/compliance-trestle/commit/49015cba8e28ca943e2116272cd9a9c02839f07c)) * remove get_fields_by_alias and alias_to_fields_map duplication (#121) -* implement get_contextual_model_type - -* remove get_fields_by_alias and alias_to_fields_map duplication - +* implement get_contextual_model_type + +* remove get_fields_by_alias and alias_to_fields_map duplication + Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`9e59cea`](https://github.com/oscal-compass/compliance-trestle/commit/9e59ceaf8a7d6885fc88374b49acafc3201851bf)) * Merge branch 'feature/split_merge_add' into feature/split-cmd ([`05e822b`](https://github.com/oscal-compass/compliance-trestle/commit/05e822b9d0af5c30743ee0d70efa9315142f26a2)) -* Use yaml target-definition example as test data ([`b20de0c`](https://github.com/oscal-compass/compliance-trestle/commit/b20de0c3c4e3c591414bb3addf89cc54dcd85792)) - * implement get_contextual_model_type (#119) -* move functions to core/utils to solve circular dependencies - -* move functions to core/utils to solve circular dependencies - -* initial list of contextual_path is not mandatory - -* make initial list of get_contextual_path function not mandatory - -* add unit tests for a few utils functions - -* implement get_contextual_model_type - +* move functions to core/utils to solve circular dependencies + +* move functions to core/utils to solve circular dependencies + +* initial list of contextual_path is not mandatory + +* make initial list of get_contextual_path function not mandatory + +* add unit tests for a few utils functions + +* implement get_contextual_model_type + Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`1622abc`](https://github.com/oscal-compass/compliance-trestle/commit/1622abc16ebacd0adb75f5a5b31aeb4f69f4560a)) +* Use yaml target-definition example as test data ([`b20de0c`](https://github.com/oscal-compass/compliance-trestle/commit/b20de0c3c4e3c591414bb3addf89cc54dcd85792)) + * Merge branch 'feature/split_merge_add' into feature/split-cmd ([`9b696bf`](https://github.com/oscal-compass/compliance-trestle/commit/9b696bfc0c32d2fbdb274891156b1bde21d3da41)) * Fix element and multilevel split command (#117) -* Fix typo - -* Handle parent path of an element_path and handle the root model name - -* Implement helper method to convert element_path to a file_path - -* Implement helper method for root path of an element path - -* Fix tests - -* Fix mypy warnings - -* Implement utility function to copy availble values from src to dest model - -* Tentative tests for split_model as part of TDD - -* Implement stripped_instance method - -* Refactor FileContentType into a new file - -* Fix to_root_path method - -* First implementation of split_model with unit test - -* Implement split of a multi item dict - -* Fix file index for splitted list items - -* Update trestle split run method to execute the plan - -* Fix plan simulate method - -* Fix trestle split run - -* Fix splitted model creation - -* Update comment - -* Implement the ability to move file to trestle trash - -* Fix bug in finding trestle project root - -* Fix code lint - -* Integration test for trestle split command - -* Helper methods to get attribute value by field or field alias - -* Element get_at should return value by field alias - -* Fix typo - -* Correct test method doc block - -* Fix Element get_at for dictionary type - -* Additional test case for list element for element.get_at - -* Initial implementation of multi level recursive split ([`47a00f2`](https://github.com/oscal-compass/compliance-trestle/commit/47a00f2dc919163678195616e309ceca2d58ea6a)) +* Fix typo + +* Handle parent path of an element_path and handle the root model name + +* Implement helper method to convert element_path to a file_path + +* Implement helper method for root path of an element path + +* Fix tests + +* Fix mypy warnings + +* Implement utility function to copy availble values from src to dest model + +* Tentative tests for split_model as part of TDD + +* Implement stripped_instance method + +* Refactor FileContentType into a new file + +* Fix to_root_path method + +* First implementation of split_model with unit test + +* Implement split of a multi item dict + +* Fix file index for splitted list items + +* Update trestle split run method to execute the plan + +* Fix plan simulate method + +* Fix trestle split run + +* Fix splitted model creation + +* Update comment + +* Implement the ability to move file to trestle trash + +* Fix bug in finding trestle project root + +* Fix code lint + +* Integration test for trestle split command + +* Helper methods to get attribute value by field or field alias + +* Element get_at should return value by field alias + +* Fix typo + +* Correct test method doc block + +* Fix Element get_at for dictionary type + +* Additional test case for list element for element.get_at + +* Initial implementation of multi level recursive split ([`47a00f2`](https://github.com/oscal-compass/compliance-trestle/commit/47a00f2dc919163678195616e309ceca2d58ea6a)) + +* Merge branch 'feature/split_merge_add' into feature/split-cmd ([`486c063`](https://github.com/oscal-compass/compliance-trestle/commit/486c063360293adc43d796f2811f7fb536ed4f88)) + +* Integration test for trestle split and fix to Element.get_at (#116) ([`16c4324`](https://github.com/oscal-compass/compliance-trestle/commit/16c432451d503d5c3850d0755c5e5d891dca2da4)) + +* Initial implementation of multi level recursive split ([`84d54d3`](https://github.com/oscal-compass/compliance-trestle/commit/84d54d3765cc1367ddd4bc5acbfc7f4a463c9d75)) + +* Additional test case for list element for element.get_at ([`5f39102`](https://github.com/oscal-compass/compliance-trestle/commit/5f3910277c45e9ec437e6392583a4e4450c97a67)) + +* Fix Element get_at for dictionary type ([`1c52b21`](https://github.com/oscal-compass/compliance-trestle/commit/1c52b21e5a2714dbd153f9350fc307fcd3cfc87a)) + +* Correct test method doc block ([`adda36d`](https://github.com/oscal-compass/compliance-trestle/commit/adda36d4f9be1860701b3937f65a4c00e02c077f)) + +* Fix typo ([`62e3234`](https://github.com/oscal-compass/compliance-trestle/commit/62e3234faedd17d7008f1fa4dd471dc40777260a)) + +* Element get_at should return value by field alias ([`27ad035`](https://github.com/oscal-compass/compliance-trestle/commit/27ad035cb7721bc83173fdceee38e55ea51b5481)) + +* Helper methods to get attribute value by field or field alias ([`0fb0b7f`](https://github.com/oscal-compass/compliance-trestle/commit/0fb0b7ffdf4f552d4c13732e524264455bd1e6f8)) + +* Integration test for trestle split command ([`dd1fecb`](https://github.com/oscal-compass/compliance-trestle/commit/dd1fecb95912349678a0be0243b39e73f2d917b6)) + +* Fix code lint ([`72bd5a5`](https://github.com/oscal-compass/compliance-trestle/commit/72bd5a58e5935dd7567e94d291d3410b20a727de)) + +* Fix bug in finding trestle project root ([`9141056`](https://github.com/oscal-compass/compliance-trestle/commit/914105652a7a99a636d113620f30745d33864547)) + +* Merge branch 'feature/split_merge_add' into feature/split-cmd ([`13ecedd`](https://github.com/oscal-compass/compliance-trestle/commit/13ecedd3228a2bee736c217e3d32eb9db7cb6ec3)) + +* Add unit tests for some utils functions and rename a few of those functions (#112) + +* move functions to core/utils to solve circular dependencies + +* move functions to core/utils to solve circular dependencies + +* initial list of contextual_path is not mandatory + +* make initial list of get_contextual_path function not mandatory + +* add unit tests for a few utils functions + +Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`e63ad1b`](https://github.com/oscal-compass/compliance-trestle/commit/e63ad1b8a42a32c14f2b4b8c49e3cdb12e8394d5)) + +* Implement utility function to move file to the Trestle trash directory (#114) + +* Fix typo + +* Handle parent path of an element_path and handle the root model name + +* Implement helper method to convert element_path to a file_path -* Merge branch 'feature/split_merge_add' into feature/split-cmd ([`486c063`](https://github.com/oscal-compass/compliance-trestle/commit/486c063360293adc43d796f2811f7fb536ed4f88)) +* Implement helper method for root path of an element path -* Initial implementation of multi level recursive split ([`84d54d3`](https://github.com/oscal-compass/compliance-trestle/commit/84d54d3765cc1367ddd4bc5acbfc7f4a463c9d75)) +* Fix tests -* Additional test case for list element for element.get_at ([`5f39102`](https://github.com/oscal-compass/compliance-trestle/commit/5f3910277c45e9ec437e6392583a4e4450c97a67)) +* Fix mypy warnings -* Fix Element get_at for dictionary type ([`1c52b21`](https://github.com/oscal-compass/compliance-trestle/commit/1c52b21e5a2714dbd153f9350fc307fcd3cfc87a)) +* Implement utility function to copy availble values from src to dest model -* Integration test for trestle split and fix to Element.get_at (#116) ([`16c4324`](https://github.com/oscal-compass/compliance-trestle/commit/16c432451d503d5c3850d0755c5e5d891dca2da4)) +* Tentative tests for split_model as part of TDD -* Correct test method doc block ([`adda36d`](https://github.com/oscal-compass/compliance-trestle/commit/adda36d4f9be1860701b3937f65a4c00e02c077f)) +* Implement stripped_instance method -* Fix typo ([`62e3234`](https://github.com/oscal-compass/compliance-trestle/commit/62e3234faedd17d7008f1fa4dd471dc40777260a)) +* Refactor FileContentType into a new file -* Element get_at should return value by field alias ([`27ad035`](https://github.com/oscal-compass/compliance-trestle/commit/27ad035cb7721bc83173fdceee38e55ea51b5481)) +* Fix to_root_path method -* Helper methods to get attribute value by field or field alias ([`0fb0b7f`](https://github.com/oscal-compass/compliance-trestle/commit/0fb0b7ffdf4f552d4c13732e524264455bd1e6f8)) +* First implementation of split_model with unit test -* Integration test for trestle split command ([`dd1fecb`](https://github.com/oscal-compass/compliance-trestle/commit/dd1fecb95912349678a0be0243b39e73f2d917b6)) +* Implement split of a multi item dict -* Fix code lint ([`72bd5a5`](https://github.com/oscal-compass/compliance-trestle/commit/72bd5a58e5935dd7567e94d291d3410b20a727de)) +* Fix file index for splitted list items -* Fix bug in finding trestle project root ([`9141056`](https://github.com/oscal-compass/compliance-trestle/commit/914105652a7a99a636d113620f30745d33864547)) +* Update trestle split run method to execute the plan -* Merge branch 'feature/split_merge_add' into feature/split-cmd ([`13ecedd`](https://github.com/oscal-compass/compliance-trestle/commit/13ecedd3228a2bee736c217e3d32eb9db7cb6ec3)) +* Fix plan simulate method -* Add unit tests for some utils functions and rename a few of those functions (#112) +* Fix trestle split run -* move functions to core/utils to solve circular dependencies - -* move functions to core/utils to solve circular dependencies - -* initial list of contextual_path is not mandatory - -* make initial list of get_contextual_path function not mandatory - -* add unit tests for a few utils functions - -Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`e63ad1b`](https://github.com/oscal-compass/compliance-trestle/commit/e63ad1b8a42a32c14f2b4b8c49e3cdb12e8394d5)) +* Fix splitted model creation -* Implement utility function to move file to the Trestle trash directory (#114) +* Update comment -* Fix typo - -* Handle parent path of an element_path and handle the root model name - -* Implement helper method to convert element_path to a file_path - -* Implement helper method for root path of an element path - -* Fix tests - -* Fix mypy warnings - -* Implement utility function to copy availble values from src to dest model - -* Tentative tests for split_model as part of TDD - -* Implement stripped_instance method - -* Refactor FileContentType into a new file - -* Fix to_root_path method - -* First implementation of split_model with unit test - -* Implement split of a multi item dict - -* Fix file index for splitted list items - -* Update trestle split run method to execute the plan - -* Fix plan simulate method - -* Fix trestle split run - -* Fix splitted model creation - -* Update comment - * Implement the ability to move file to trestle trash ([`f75d9f2`](https://github.com/oscal-compass/compliance-trestle/commit/f75d9f2aa033bbe65cb8a3dfff90b47c74af17ee)) * fix FIXME on line 113 from split.py file ([`bf3252d`](https://github.com/oscal-compass/compliance-trestle/commit/bf3252d3252595ab66c28e4f17b3e791d628bb94)) @@ -15051,44 +15603,58 @@ Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`e63ad1b`](https://github.c * Initial implementation of Trestle split command (#113) -* Fix typo - -* Handle parent path of an element_path and handle the root model name - -* Implement helper method to convert element_path to a file_path - -* Implement helper method for root path of an element path - -* Fix tests - -* Fix mypy warnings - -* Implement utility function to copy availble values from src to dest model - -* Tentative tests for split_model as part of TDD - -* Implement stripped_instance method - -* Refactor FileContentType into a new file - -* Fix to_root_path method - -* First implementation of split_model with unit test - -* Implement split of a multi item dict - -* Fix file index for splitted list items - -* Update trestle split run method to execute the plan - -* Fix plan simulate method - -* Fix trestle split run - +* Fix typo + +* Handle parent path of an element_path and handle the root model name + +* Implement helper method to convert element_path to a file_path + +* Implement helper method for root path of an element path + +* Fix tests + +* Fix mypy warnings + +* Implement utility function to copy availble values from src to dest model + +* Tentative tests for split_model as part of TDD + +* Implement stripped_instance method + +* Refactor FileContentType into a new file + +* Fix to_root_path method + +* First implementation of split_model with unit test + +* Implement split of a multi item dict + +* Fix file index for splitted list items + +* Update trestle split run method to execute the plan + +* Fix plan simulate method + +* Fix trestle split run + * Fix splitted model creation ([`8958706`](https://github.com/oscal-compass/compliance-trestle/commit/895870647a1a120aab9ad20f81ecabdff4dd4d12)) * Merge branch 'feature/split_merge_add' into feature/split-cmd ([`bfd7acd`](https://github.com/oscal-compass/compliance-trestle/commit/bfd7acd30886da1c5a370cadb33e12d99a0dbc10)) +* feature: trestle merge -l + +* move functions to core/utils to solve circular dependencies + +* initial list of contextual_path is not mandatory + +* make initial list of get_contextual_path function not mandatory + +Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`2f3d2d5`](https://github.com/oscal-compass/compliance-trestle/commit/2f3d2d558afc8bf7091b29bd96ddde9d6aeaf773)) + +* Support parent path and root model for ElementPath (#109) ([`eeba858`](https://github.com/oscal-compass/compliance-trestle/commit/eeba8586fd634faaff21629b102236a84e73a3b4)) + +* move utility functions from utils to cmd_utils ([`2699353`](https://github.com/oscal-compass/compliance-trestle/commit/26993530ce5e8fe156854cd043a9ce1a04581bfc)) + * Fix splitted model creation ([`e2e0a6a`](https://github.com/oscal-compass/compliance-trestle/commit/e2e0a6aedf3f0bd2e515cfda26a4e2ea1cc61097)) * Fix trestle split run ([`ea6e6c9`](https://github.com/oscal-compass/compliance-trestle/commit/ea6e6c9bfa3dd05273dbdf821e7503d0701e36bc)) @@ -15109,24 +15675,12 @@ Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`e63ad1b`](https://github.c * Implement stripped_instance method ([`d20db23`](https://github.com/oscal-compass/compliance-trestle/commit/d20db23b9aced367c641eeaec673ace93686b8fd)) -* feature: trestle merge -l - -* move functions to core/utils to solve circular dependencies - -* initial list of contextual_path is not mandatory - -* make initial list of get_contextual_path function not mandatory - -Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`2f3d2d5`](https://github.com/oscal-compass/compliance-trestle/commit/2f3d2d558afc8bf7091b29bd96ddde9d6aeaf773)) - * Tentative tests for split_model as part of TDD ([`9844413`](https://github.com/oscal-compass/compliance-trestle/commit/9844413509e02a7f6a374e032338a9c3bdbb4614)) * Implement utility function to copy availble values from src to dest model ([`d590a34`](https://github.com/oscal-compass/compliance-trestle/commit/d590a34780a1a2215d71005b49e12be5552cd2af)) * Fix mypy warnings ([`66372e2`](https://github.com/oscal-compass/compliance-trestle/commit/66372e27ddbf052ae72adcd57b82e7e3d176ab45)) -* Support parent path and root model for ElementPath (#109) ([`eeba858`](https://github.com/oscal-compass/compliance-trestle/commit/eeba8586fd634faaff21629b102236a84e73a3b4)) - * Fix tests ([`377a869`](https://github.com/oscal-compass/compliance-trestle/commit/377a8691bda1f1dd448eb7ba241ba9029459afb3)) * Implement helper method for root path of an element path ([`61e9225`](https://github.com/oscal-compass/compliance-trestle/commit/61e9225ac517e2d20f043da33c085de829df3eb3)) @@ -15135,18 +15689,8 @@ Co-authored-by: Bruno <brunomar@au1.ibm.com> ([`2f3d2d5`](https://github.c * Handle parent path of an element_path and handle the root model name ([`ebcd9a4`](https://github.com/oscal-compass/compliance-trestle/commit/ebcd9a4c3446b9eebb8e8341c469de3ac1e6da29)) -* Edit and proofread README and CONTRIBUTING (#106) - -* Edit and proofread README and CONTRIBUTING - -* fixed typo implicitly - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`6473d92`](https://github.com/oscal-compass/compliance-trestle/commit/6473d9216af4f6a791332c3a3ac6abbd09bb0848)) - * Fix typo ([`c35b1dd`](https://github.com/oscal-compass/compliance-trestle/commit/c35b1dd58ff368e673d4428150c5eab4edb75340)) -* move utility functions from utils to cmd_utils ([`2699353`](https://github.com/oscal-compass/compliance-trestle/commit/26993530ce5e8fe156854cd043a9ce1a04581bfc)) - * Sync split, merge and add workstreams ([`5bbadf6`](https://github.com/oscal-compass/compliance-trestle/commit/5bbadf673160ab1018bbd07c35dc0224183519ab)) * Add utility functions for trestle merge ([`0b4c265`](https://github.com/oscal-compass/compliance-trestle/commit/0b4c265a417335acf03c8c478659b9425f44fe08)) @@ -15165,178 +15709,141 @@ Co-authored-by: Chris Butler <chris@thebutlers.me> ([`6473d92`](https://gi * Foundation of Trestle Plan, Action and Elements (#93) -* Git ignore tmp directory - -* Add arguments for split command - -* Define classes for command plan, action and element - -* Fix import order and update comments - -* Add action rollback method interface - -* Update command's plan API - -* Implement the Command Plan class - -* Implement __str__ method for Plan - -* Implement WriteAction, WriteFileAction with unit tests - -* Fix linting and format errors - -* Implement AppendFileAction - -* Fix lint error - -* Update ActionType enum - -* Implement initial version of Plan.execute() - -* Cleanup dirs after unit test - -* Add helper method to clear all actions in a plan - -* Fixed Plan.rollback - -* Rename module name to plural for semantic consistency - -* Add unit test for element and element_path - -* Allow element path to express array elements and wildcard - -* Implement element.set_at method - -* Update comment - -* Fix AddAction - -* Update comment - -* Tidy up and add comments - -* Convert get_sub_element_class to a class method for potential reuse - -* Fix method signature - -* Improve code coverage to 100% for elements.py - -* Use pathlib and handle tmp_dir for tests automatically - -* Fix auto cleanup of tmp directory after tests - -* Reuse oscal_read and oscal_wrapper method - -* Fix code-lint issues - -* Add .vscode in gitignore - -* Allow multiple model object types for sub-element - -* Implement AddAction and tests - -* Fix doc block - -* Finalize implementation of actions - -We renamed AddAction to UpdateAction and removed redundant ReadAction - -* Fixed comment - -* Corrected module doc string - -* Fix code lint - -* Implement unit tests for fs module - -* Remove unused function - -* Improve coverage for utils.fs module - -* Implement helper method to get trestle project root in the path - -* Use pathlib to create temp files and fix code-lint errors - -* Update comment for clarity - -* Fix code lint - -* Implemenet CreatePathAction - -* Fix index counter increment - -* Fix and add error checks - -* Update comment for clarity - -* Refactor a test-utils method for reusability - -* Impelement unit test for CreatePathAction with full coverage - -* Fix code-format issue - -* Remove redundant AppendFileAction and update WriteFileAction with checks - -* Allow lazy check for file existence during WriteFileAction - -This is to support the assumption that CreatePathAction in the Plan will must preceed the WriteFileAction - -* CreatePathAction in the Plan should preceed the WriteFileAction - -* Fix lint errors - -* Fix typo - -* Remove unnecessary equality check method - -* Improve code coverage for err module - -* Improve coverage - -* Update comment - -* Code skeleton for trestle split - -* Implement parse_element_args method and unit tests ([`d95a764`](https://github.com/oscal-compass/compliance-trestle/commit/d95a764e7e4e9ec796e2782d3d022a8a76c6417b)) +* Git ignore tmp directory -* Merge branch 'develop' of github.com:IBM/compliance-trestle into develop ([`f1ef709`](https://github.com/oscal-compass/compliance-trestle/commit/f1ef709fd26bb50ba68fdd4b4300de48d26aecad)) +* Add arguments for split command +* Define classes for command plan, action and element -## v0.1.1 (2020-10-05) +* Fix import order and update comments -### Chore +* Add action rollback method interface -* chore: Add windows support to CICD and associated test +* Update command's plan API - - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`b6f2203`](https://github.com/oscal-compass/compliance-trestle/commit/b6f2203c175d12a1820047ff310077ea27b1c983)) +* Implement the Command Plan class -### Documentation +* Implement __str__ method for Plan -* docs: Updated documentation with a short description of target (#90) +* Implement WriteAction, WriteFileAction with unit tests -* Updated documentation with a short description of target - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`bcd20dc`](https://github.com/oscal-compass/compliance-trestle/commit/bcd20dc0d117835347f9b9ee736ae4106fe12326)) +* Fix linting and format errors -### Fix +* Implement AppendFileAction -* fix: Corrected typing of parameter-settings in profile and ssp (#97) +* Fix lint error -* fix: Corrected typing of parameter-settings in profile. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added error which was missed in original hotfix - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`9a5ef55`](https://github.com/oscal-compass/compliance-trestle/commit/9a5ef55d9d504f3e32b73277f116172e05281081)) +* Update ActionType enum -### Unknown +* Implement initial version of Plan.execute() -* Correcting missed pre-commit change that broke build process. (#102) +* Cleanup dirs after unit test -Signed-off-by: Nebula Alam <anebula@au1.ibm.com> ([`7c1820d`](https://github.com/oscal-compass/compliance-trestle/commit/7c1820dbfdd23c3ca0ed592b369a69f056b81c3f)) +* Add helper method to clear all actions in a plan + +* Fixed Plan.rollback + +* Rename module name to plural for semantic consistency + +* Add unit test for element and element_path + +* Allow element path to express array elements and wildcard + +* Implement element.set_at method + +* Update comment + +* Fix AddAction + +* Update comment + +* Tidy up and add comments + +* Convert get_sub_element_class to a class method for potential reuse + +* Fix method signature + +* Improve code coverage to 100% for elements.py + +* Use pathlib and handle tmp_dir for tests automatically + +* Fix auto cleanup of tmp directory after tests + +* Reuse oscal_read and oscal_wrapper method + +* Fix code-lint issues + +* Add .vscode in gitignore + +* Allow multiple model object types for sub-element + +* Implement AddAction and tests + +* Fix doc block + +* Finalize implementation of actions + +We renamed AddAction to UpdateAction and removed redundant ReadAction + +* Fixed comment + +* Corrected module doc string + +* Fix code lint + +* Implement unit tests for fs module + +* Remove unused function + +* Improve coverage for utils.fs module + +* Implement helper method to get trestle project root in the path + +* Use pathlib to create temp files and fix code-lint errors + +* Update comment for clarity + +* Fix code lint + +* Implemenet CreatePathAction + +* Fix index counter increment + +* Fix and add error checks + +* Update comment for clarity + +* Refactor a test-utils method for reusability + +* Impelement unit test for CreatePathAction with full coverage + +* Fix code-format issue + +* Remove redundant AppendFileAction and update WriteFileAction with checks + +* Allow lazy check for file existence during WriteFileAction + +This is to support the assumption that CreatePathAction in the Plan will must preceed the WriteFileAction + +* CreatePathAction in the Plan should preceed the WriteFileAction + +* Fix lint errors + +* Fix typo + +* Remove unnecessary equality check method + +* Improve code coverage for err module + +* Improve coverage + +* Update comment + +* Code skeleton for trestle split + +* Implement parse_element_args method and unit tests ([`d95a764`](https://github.com/oscal-compass/compliance-trestle/commit/d95a764e7e4e9ec796e2782d3d022a8a76c6417b)) + +* Merge branch 'develop' of github.com:IBM/compliance-trestle into develop ([`f1ef709`](https://github.com/oscal-compass/compliance-trestle/commit/f1ef709fd26bb50ba68fdd4b4300de48d26aecad)) * provide LUT to handle parameter_settings for fix_any.py (#98) @@ -15344,18 +15851,18 @@ Co-authored-by: Chris Butler <chris@thebutlers.me> ([`e574108`](https://gi * Fix/hotfix set parameter:Merging back into develop (#100) -* 0.1.0 - -Automatically generated by python-semantic-release - -* fix: Corrected typing of parameter-settings in profile. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Added error which was missed in original hotfix - -Signed-off-by: Chris Butler <chris@thebutlers.me> - +* 0.1.0 + +Automatically generated by python-semantic-release + +* fix: Corrected typing of parameter-settings in profile. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Added error which was missed in original hotfix + +Signed-off-by: Chris Butler <chris@thebutlers.me> + Co-authored-by: semantic-release <semantic-release> ([`5b709a2`](https://github.com/oscal-compass/compliance-trestle/commit/5b709a25e4c7abd85a7b3e88e2ec510eb8fc9931)) * Update setup.cfg (#87) @@ -15376,20 +15883,20 @@ Signed-off-by: Chris Butler <chris@thebutlers.me> ([`857280d`](https://git * Merge branch 'develop' into chore/windows_CICD ([`8aab4e1`](https://github.com/oscal-compass/compliance-trestle/commit/8aab4e191e02edc714b13f9f6b02adf415cf6289)) -* Remove os.sep +* Convert gen_oscal.sh to py and fix test to run on windows (#77) -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e20d3be`](https://github.com/oscal-compass/compliance-trestle/commit/e20d3beb10b8368588339f46f5cb5922a6012e20)) +* convert gen_oscal.sh to gen_oscal.py and regenerate classes -* Convert gen_oscal.sh to py and fix test to run on windows (#77) +* fix test that fails on windows re file creation when dir is readonly + +* one char typo in fix_any prevented proper termination -* convert gen_oscal.sh to gen_oscal.py and regenerate classes - -* fix test that fails on windows re file creation when dir is readonly - -* one char typo in fix_any prevented proper termination - * added yapf and flake8 checks on scripts dir ([`d11e797`](https://github.com/oscal-compass/compliance-trestle/commit/d11e79732495332a6a5b78b4093df38a8addc6cc)) +* Remove os.sep + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e20d3be`](https://github.com/oscal-compass/compliance-trestle/commit/e20d3beb10b8368588339f46f5cb5922a6012e20)) + * Remerging code Signed-off-by: Chris Butler <chris@thebutlers.me> ([`5b56d39`](https://github.com/oscal-compass/compliance-trestle/commit/5b56d39d96505d19d0dd5fedfcedb8b102ff27ba)) @@ -15420,89 +15927,22 @@ Signed-off-by: Chris Butler <chris@thebutlers.me> ([`0dbdacc`](https://git * Merge branch 'develop' of github.com:IBM/compliance-trestle into develop ([`17289b5`](https://github.com/oscal-compass/compliance-trestle/commit/17289b5f71b3d5642db53337b7c595dd2cf4ee8b)) - -## v0.1.0 (2020-09-23) - -### Documentation - -* docs: fix target-definition examples in trestle specifications (#50) - -* docs: fix target-definition examples in trestle specifications -* docs: fix split command with -e groups[].controls[] and add example for config.ini -* docs: add trestle replicate to the list of subcommands - -closes #49 -signed-off-by: Bruno <brunomar@au1.ibm.com> ([`b84ff9b`](https://github.com/oscal-compass/compliance-trestle/commit/b84ff9b4082e001304550b259ae3a1f9d6a70ea7)) - -### Feature - -* feat: Merge pull request #65 from IBM/develop - -Releasing trestle init along with updated object model. ([`0f8b637`](https://github.com/oscal-compass/compliance-trestle/commit/0f8b637d897689450907eca4e7add1dda2016dcd)) - -* feat: implement trestle init command and update specs (#60) - -* unit test for cli.py -* fix dependency conflict when running make install -* install requirements to resolve dependency conflict with attrs -* add initial structure for trestle commands -* modify initial specs for trestle split and merge -* add -f option to trestle split command -* add -f -d options to trestle merge command -* explain future behaviour of trestle split and merge -* add link to contents example of trestle split merge commands -* add trestle remove command -* update decomposition rules to new trestle split format -* update explanation on what to find under each folder -* update trestle split and merge commands -* use fs.load_file for support of both json and yaml files -* add coverage to .gitignore -* rename test folder to tests -* add resources from trestle.resources build package -* implement trestle init command by creating directory structure and initial config files -* add initial config file for trestle project -* add constants for trestle directories and config files -* add unit tests for init command -* add remove subcommand to the list -* move 'dist' string to constants file - -Closes #36 -Signed-off-by: Bruno <brunomar@au1.ibm.com> ([`6c6b000`](https://github.com/oscal-compass/compliance-trestle/commit/6c6b000795d605514de78198495a941d9d88910f)) - -### Fix - -* fix: Fix/issue 57 (#59) - -Corrected fix_any.py to correctly behave with the Makefile stage for which it is run. - -closes: #57 ([`1faf0a7`](https://github.com/oscal-compass/compliance-trestle/commit/1faf0a7a7795f6e29dd47bb14affdb6a6ea88b0d)) - -* fix: the Any problem in codegen classes. - -Creates a script which corrects current erroneous behavior in `datamodel-code-generator`. Updates pydantic models to ensure code-generated classes to be functionally correct for OSCAL. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -Co-authored-by: Chris Butler <chris@thebutlers.me> ([`22ba2fc`](https://github.com/oscal-compass/compliance-trestle/commit/22ba2fc75baa11626b49ba709610b3bcaf59cea3)) - -### Unknown - * Merge branch 'master' into develop ([`a94335b`](https://github.com/oscal-compass/compliance-trestle/commit/a94335bfc30886d706433ce0e891a2ef391b5e98)) * Merge branch 'master' into develop ([`9078972`](https://github.com/oscal-compass/compliance-trestle/commit/9078972a4a5442af9f01597b61554cd1d92430a3)) -* feature: Feature/object manipulation (#58) +## v0.0.3 (2020-09-16) -Initial functionality for allowing creating of 'partial' models for use in split / merge. - -closes: #52 - -Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d76dbfa`](https://github.com/oscal-compass/compliance-trestle/commit/d76dbfa177d91e54716eb16d3194ceb59c789b7f)) +### Documentation +* docs: fix target-definition examples in trestle specifications (#50) -## v0.0.3 (2020-09-16) +* docs: fix target-definition examples in trestle specifications +* docs: fix split command with -e groups[].controls[] and add example for config.ini +* docs: add trestle replicate to the list of subcommands -### Documentation +closes #49 +signed-off-by: Bruno <brunomar@au1.ibm.com> ([`b84ff9b`](https://github.com/oscal-compass/compliance-trestle/commit/b84ff9b4082e001304550b259ae3a1f9d6a70ea7)) * docs: remove git references @@ -15524,12 +15964,57 @@ Add example of catalag being edited via trestle using trestle split and trestle * docs: add specifications for trestle commands ([`698eff8`](https://github.com/oscal-compass/compliance-trestle/commit/698eff8a9bb60d3c9090ad74ad51e57c9bec3d76)) +### Feature + +* feat: implement trestle init command and update specs (#60) + +* unit test for cli.py +* fix dependency conflict when running make install +* install requirements to resolve dependency conflict with attrs +* add initial structure for trestle commands +* modify initial specs for trestle split and merge +* add -f option to trestle split command +* add -f -d options to trestle merge command +* explain future behaviour of trestle split and merge +* add link to contents example of trestle split merge commands +* add trestle remove command +* update decomposition rules to new trestle split format +* update explanation on what to find under each folder +* update trestle split and merge commands +* use fs.load_file for support of both json and yaml files +* add coverage to .gitignore +* rename test folder to tests +* add resources from trestle.resources build package +* implement trestle init command by creating directory structure and initial config files +* add initial config file for trestle project +* add constants for trestle directories and config files +* add unit tests for init command +* add remove subcommand to the list +* move 'dist' string to constants file + +Closes #36 +Signed-off-by: Bruno <brunomar@au1.ibm.com> ([`6c6b000`](https://github.com/oscal-compass/compliance-trestle/commit/6c6b000795d605514de78198495a941d9d88910f)) + ### Fix * fix: Merge pull request #47 from IBM/develop Release PR: Updated to docs and a broken dependency ([`ab8ba4d`](https://github.com/oscal-compass/compliance-trestle/commit/ab8ba4d05ee9c41097233c3b0ca92fa6251b88c4)) +* fix: Fix/issue 57 (#59) + +Corrected fix_any.py to correctly behave with the Makefile stage for which it is run. + +closes: #57 ([`1faf0a7`](https://github.com/oscal-compass/compliance-trestle/commit/1faf0a7a7795f6e29dd47bb14affdb6a6ea88b0d)) + +* fix: the Any problem in codegen classes. + +Creates a script which corrects current erroneous behavior in `datamodel-code-generator`. Updates pydantic models to ensure code-generated classes to be functionally correct for OSCAL. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +Co-authored-by: Chris Butler <chris@thebutlers.me> ([`22ba2fc`](https://github.com/oscal-compass/compliance-trestle/commit/22ba2fc75baa11626b49ba709610b3bcaf59cea3)) + * fix: fix conflict between attrs and markdown-it-py fixed error caused when running pip install @@ -15539,20 +16024,28 @@ Signed-off-by: Bruno <brunomar@au1.ibm.com> ([`b0d588f`](https://github.co * fix: Issue templates are not being picked up by github. (#31) -Updated issue templates such that github will pick up for use in the UI. - +Updated issue templates such that github will pick up for use in the UI. + Signed-off-by: Chris Butler <chris@thebutlers.me> ([`1382fbc`](https://github.com/oscal-compass/compliance-trestle/commit/1382fbce9db86cf54ac9de97cde4b32b2890e599)) ### Unknown +* feature: Feature/object manipulation (#58) + +Initial functionality for allowing creating of 'partial' models for use in split / merge. + +closes: #52 + +Signed-off-by: Chris Butler <chris@thebutlers.me> ([`d76dbfa`](https://github.com/oscal-compass/compliance-trestle/commit/d76dbfa177d91e54716eb16d3194ceb59c789b7f)) + * Merge pull request #45 from IBM/fix/attrs-dep-conflict fix: fix conflict between attrs and markdown-it-py ([`53ae560`](https://github.com/oscal-compass/compliance-trestle/commit/53ae5604e4397993586499a277a66228bbb7e492)) * fix:Updated with missing proposed change template header -Signed-off-by: Chris Butler <chris@thebutlers.me> - +Signed-off-by: Chris Butler <chris@thebutlers.me> + Co-authored-by: Bruno <bruno.assis.marques@gmail.com> ([`4bffa69`](https://github.com/oscal-compass/compliance-trestle/commit/4bffa6952873bb75b014d002a8ee23b1002e7933)) * Merge pull request #33 from IBM/docs/trestle-spec @@ -15563,7 +16056,6 @@ docs: add specifications and examples for trestle commands ([`9369e7d`](https:// * Merge branch 'develop' into docs/trestle-spec ([`db43023`](https://github.com/oscal-compass/compliance-trestle/commit/db43023bc3209bd108cb94fcc80d34c32a9e95d9)) - ## v0.0.2 (2020-09-10) ### Fix @@ -15574,8 +16066,8 @@ fix: force use of PAT token ([`4b860d2`](https://github.com/oscal-compass/compli * fix: Sem release credentials changed -fix: Sem release credentials changed. - +fix: Sem release credentials changed. + Signed-off-by: Chris Butler <chris@thebutlers.me> ([`4bb6f34`](https://github.com/oscal-compass/compliance-trestle/commit/4bb6f346d49fe422caa6c6a95ffa0fbd769739b1)) * fix: Attempting to fix semantic release @@ -15584,74 +16076,74 @@ fix: Attempting to fix semantic release ([`6215249`](https://github.com/oscal-co * fix: Improved stage builds -fix: Improved stage builds -* Reverted semantic release to "hand coded" form. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Simplified codecov.yml - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Simplified codecov.yml - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Even simplier semantc release - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated testing to run checkout and install dev tools - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Updated testing to run checkout and install dev tools - +fix: Improved stage builds +* Reverted semantic release to "hand coded" form. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Simplified codecov.yml + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Simplified codecov.yml + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Even simplier semantc release + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated testing to run checkout and install dev tools + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Updated testing to run checkout and install dev tools + Signed-off-by: Chris Butler <chris@thebutlers.me> ([`ac9e416`](https://github.com/oscal-compass/compliance-trestle/commit/ac9e4169039d6f59c4e2e42c6de2c1306bad0bf8)) * fix: Semantic release build issues -fix: Semantic release build issues - -* Reverted semantic release to "hand coded" form. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Simplified codecov.yml - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Simplified codecov.yml - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Even simplier semantc release - +fix: Semantic release build issues + +* Reverted semantic release to "hand coded" form. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Simplified codecov.yml + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Simplified codecov.yml + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Even simplier semantc release + Signed-off-by: Chris Butler <chris@thebutlers.me> ([`382aef7`](https://github.com/oscal-compass/compliance-trestle/commit/382aef7a286b918ea9bb6369159361153454d42a)) * fix: Reverted semantic release to hand coded form -* Reverted semantic release to "hand coded" form. - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Simplified codecov.yml - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* Simplified codecov.yml - +* Reverted semantic release to "hand coded" form. + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Simplified codecov.yml + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* Simplified codecov.yml + Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e6b973d`](https://github.com/oscal-compass/compliance-trestle/commit/e6b973ded99ec9d49e25e1ab5b5003107be74241)) * fix: Added github PAT to avoid issues with semantic release -fix: Added github PAT to avoid issues with semantic release -* Adding codecov yaml - -Signed-off-by: Chris Butler <chris@thebutlers.me> - -* fix: Added github PAT to avoid issues with semantic release - +fix: Added github PAT to avoid issues with semantic release +* Adding codecov yaml + +Signed-off-by: Chris Butler <chris@thebutlers.me> + +* fix: Added github PAT to avoid issues with semantic release + Signed-off-by: Chris Butler <chris@thebutlers.me> ([`eaeff63`](https://github.com/oscal-compass/compliance-trestle/commit/eaeff63aa0a4f050c4a651af4052d4b7fe621363)) * fix: adding codecov @@ -15660,10 +16152,10 @@ Signed-off-by: Chris Butler <chris@thebutlers.me> ([`e1b5046`](https://git * fix(workflow): new line at the end of test workflow -fix(workflow): new line at the end of test workflow - -Fixing setup.cfg to run semantic-release on master branch. - +fix(workflow): new line at the end of test workflow + +Fixing setup.cfg to run semantic-release on master branch. + Co-authored-by: Nebula Alam <anebula@au1.ibm.com> ([`95a0568`](https://github.com/oscal-compass/compliance-trestle/commit/95a0568f4d032e13c45fc0acda094c43f69ea8cf)) * fix(workflow): new line at the end of release workflow ([`1b5edeb`](https://github.com/oscal-compass/compliance-trestle/commit/1b5edebb49bc28eebae3e6b49b2120bb998da030)) @@ -15672,20 +16164,20 @@ Co-authored-by: Nebula Alam <anebula@au1.ibm.com> ([`95a0568`](https://git * Fix/sem release 2 (#19) -fix(.github/workflows): Fix semantic release - -* Updated actions for semantic release -* Corrected semantic release library -* Update to leverage recommended semantic release - +fix(.github/workflows): Fix semantic release + +* Updated actions for semantic release +* Corrected semantic release library +* Update to leverage recommended semantic release + Signed-off-by: Nebula Alam <anebula@au1.ibm.com> ([`dce88fb`](https://github.com/oscal-compass/compliance-trestle/commit/dce88fb36fd7f85230e18f5c13800b33e986af10)) * Updated actions for semantic release (#18) -fix(.github/workflows): Fix release workflow - -fix python-test on github actions workflow to release to PYPI on successful build. - +fix(.github/workflows): Fix release workflow + +fix python-test on github actions workflow to release to PYPI on successful build. + Signed-off-by: Chris Butler <chris@thebutlers.me> ([`95a9e5e`](https://github.com/oscal-compass/compliance-trestle/commit/95a9e5eaba5f7f60cac2727034dbed9a827cd0c4)) * chrore(trestle): Repo initialisation (#1) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 945075abf..7b9622fde 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -13,8 +13,6 @@ Before embarking on a more ambitious contribution, please quickly [get in touch] requires extensive rework (by you or by us), sits in backlog for a long time, or cannot be accepted at all!** -We have also adopted [Contributor Covenant Code of Conduct](https://oscal-compass.github.io/compliance-trestle/mkdocs_code_of_conduct/). - ### Proposing new features If you would like to implement a new feature, please [raise an issue](https://github.com/oscal-compass/compliance-trestle/issues) @@ -34,6 +32,17 @@ review to indicate acceptance. A change requires LGTMs from one of the maintaine For a list of the maintainers, see the [maintainers](https://oscal-compass.github.io/compliance-trestle/maintainers/) page. +### Trestle updating, testing and release logistics + +Contributors should make a working copy (branch or fork) from the develop branch of `trestle`. +Contributors should update the working copy with changes, then create a pull request to merge into the develop branch. +Contributors must include test cases to meet at least the minimum code coverage requirements. +Upon approval from reviewer(s), the working copy is squashed and merged into the develop branch. +Upon a cadence established by the maintainers, the develop branch is merged into the main branch and a new release is uniquely numbered and pushed to [pypi](https://pypi.org/project/compliance-trestle/). + +`trestle` employs `semantic release` to automatically control release numbering. +Code deliveries should be tagged with prefix `fix:` for changes that are bug fixes or `feat:` for changes that are new features. See [allowed_tags](https://python-semantic-release.readthedocs.io/en/latest/commit-parsing.html#:~:text=The%20default%20configuration%20options%20for%20semantic_release.commit_parser.AngularCommitParser%20are%3A) for a list of supported tags. + ### Trestle merging and release workflow `trestle` is operating on a simple, yet opinionated, method for continuous integration. It's designed to give developers a coherent understanding of the objectives of other past developers. @@ -52,7 +61,7 @@ In trestle's CI environment this results in the following rules: 1. Trestle will release on demand the default approach for a hot fix should be to merge into `develop`, followed by releasing to `main`, unless this will release functionality that is not ready. 1. Each feature/fix/chore (PR into develop) be represented by a single commit into develop / main with a coherent title (in the PR). 1. The trestle preference for doing this is to use squash merge functionality when merging a PR into develop. -1. Developers *MUST* pass the required CI checks for each PR. +1. Developers *MUST* pass the required CI checks for each PR. The checks enforce code quality with a format checker (yapf) and linter (flake8). 1. Developers are encouraged to use GitHub's automated merge process where possible to keep the number of active PR's low. ### Merge details for committers: @@ -88,7 +97,7 @@ Software License 2.0. Using the SPDX format is the simplest approach. e.g. ```text -# Copyright (c) 2020 IBM Corp. All rights reserved. +# Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -105,7 +114,7 @@ e.g. We have tried to make it as easy as possible to make contributions. This applies to how we handle the legal aspects of contribution. We use the -same approach - the [Developer's Certificate of Origin 1.1 (DCO)](https://oscal-compass.github.io/compliance-trestle/contributing/DCO/) - that the Linux® Kernel [community](https://elinux.org/Developer_Certificate_Of_Origin) +same approach - the [Developer's Certificate of Origin 1.1 (DCO)](https://oscal-compass.github.io/compliance-trestle/contributing/DCO/) - that the Linux® Kernel [community](https://developercertificate.org/) uses to manage code contributions. We simply ask that when submitting a patch for review, the developer @@ -166,7 +175,7 @@ Test discovery should be automatic when you select a .py file for editing. After Sometimes the discovery fails - and you may need to resort to uninstalling the python extension and reinstalling it - perhaps also shutting down code and restarting. This is a lightweight operation and seems to be safe and usually fixes any problems. -Test disovery will fail or stop if any of the tests have errors in them - so be sure to monitor the Problems panel at the bottom for problems in the code. +Test discovery will fail or stop if any of the tests have errors in them - so be sure to monitor the Problems panel at the bottom for problems in the code. Note that there are many panels available in Output - so be sure to check `Python Test Log` for errors and output from the tests. @@ -181,8 +190,22 @@ Trestle relies on reference data from two NIST repositories for testing: Both of these repositories are submodules in the trestle project. In order to develop / test trestle the submodules must be checked out with `git submodule update --init` or `make submodules`. +### Code testing + +Tests must exist for at least 96% of trestle Python code. To determine the code coverage locally during development: + +```bash +make test-cov +``` + +A PR without sufficient test coverage will fail the trestle CI process and will not be approved or merged. + +Additional code scrutiny is applied in the trestle CI pipeline by [SonarCloud](https://sonarcloud.io/project/overview?id=compliance-trestle). Any failures must be addressed before code merging. + ### Code style and formating +Python code should generally follow [PEP 8](https://peps.python.org/pep-0008/). + `trestle` uses [yapf](https://github.com/google/yapf) for code formatting and [flake8](https://flake8.pycqa.org/en/latest/) for code styling. It also uses [pre-commit](https://pre-commit.com/) hooks that are integrated into the development process and the CI. When you run `make develop` you are ensuring that the pre-commit hooks are installed and updated to their latest versions for this repository. This ensures that all delivered code has been properly formatted and passes the linter rules. See the [pre-commit configuration file](https://github.com/oscal-compass/compliance-trestle/blob/develop/.pre-commit-config.yaml) for details on `yapf` and `flake8` configurations. @@ -250,4 +273,4 @@ ______________________________________________________________________ ##### Overview of process to take OSCAL models and upgrade trestle Python code - +![](images/trestle-OSCAL-upgrade.png) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index a97300306..da60ba7e1 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -6,8 +6,6 @@ Christopher Butler [butler54](https://github.com/butler54) Lou Degenaro [degenaro](https://github.com/degenaro) -Frank Suits [fsuits](https://github.com/fsuits) - Jennifer Power [jpower432](https://github.com/jpower432) Manjiree Gadgil [mrgadgil](https://github.com/mrgadgil) diff --git a/Makefile b/Makefile index 0482664ff..b65b30ed1 100644 --- a/Makefile +++ b/Makefile @@ -82,6 +82,12 @@ release:: gen-oscal:: python ./scripts/gen_oscal.py +docs-osx-deps: + brew install cairo freetype libffi libjpeg libpng zlib + +docs-ubuntu-deps: + sudo apt-get -y install libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev + docs-automation:: python ./scripts/website_automation.py @@ -117,4 +123,4 @@ pylint-test: pylint tests --rcfile=.pylintrc_tests check-for-changes: - python scripts/have_files_changed.py -u \ No newline at end of file + python scripts/have_files_changed.py -u diff --git a/README.md b/README.md index d00e401d5..e9b28a9e6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Logo Compliance-trestle (also known as `trestle`) +# Logo Compliance-trestle (also known as `trestle`) ![[OS Compatibility](#prerequisites)](https://img.shields.io/badge/platform-osx%20%7C%20linux%20%7C%20windows-orange.svg) ![PyPI - Python Version](https://img.shields.io/pypi/pyversions/compliance-trestle) @@ -6,7 +6,7 @@ ![[Code Coverage](https://sonarcloud.io/dashboard?id=compliance-trestle)](https://sonarcloud.io/api/project_badges/measure?project=compliance-trestle&metric=coverage) ![[Quality gate](https://sonarcloud.io/dashboard?id=compliance-trestle)](https://sonarcloud.io/api/project_badges/measure?project=compliance-trestle&metric=alert_status) ![[Pypi](https://pypi.org/project/compliance-trestle/)](https://img.shields.io/pypi/dm/compliance-trestle) -![GitHub Actions status](https://img.shields.io/github/workflow/status/oscal-compass/compliance-trestle/Trestle%20PR%20pipeline?event=push) +![GitHub Actions status](https://github.com/oscal-compass/compliance-trestle/actions/workflows/python-test.yml/badge.svg?branch=develop) Trestle is an ensemble of tools that enable the creation, validation, and governance of documentation artifacts for compliance needs. It leverages NIST's [OSCAL](https://pages.nist.gov/OSCAL/) as a standard data format for interchange between tools and people, and provides an opinionated approach to OSCAL adoption. @@ -102,13 +102,17 @@ Please refer to the community [README](https://github.com/oscal-compass/communit Our project welcomes external contributions. Please consult [contributing](https://oscal-compass.github.io/compliance-trestle/contributing/mkdocs_contributing/) to get started. +## Code of Conduct + +Participation in the OSCAL Compass community is governed by the [Code of Conduct](https://github.com/oscal-compass/community/blob/main/CODE_OF_CONDUCT.md). + ## License & Authors If you would like to see the detailed LICENSE click [here](LICENSE). Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graphs/contributors) for a list of authors and [maintainers](MAINTAINERS.md) for the core team. ```text -# Copyright (c) 2020 IBM Corp. All rights reserved. +# Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -121,5 +125,17 @@ Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graph # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - ``` + +______________________________________________________________________ + +We are a Cloud Native Computing Foundation sandbox project. + + + + + + +The Linux Foundation® (TLF) has registered trademarks and uses trademarks. For a list of TLF trademarks, see [Trademark Usage](https://www.linuxfoundation.org/legal/trademark-usage)". + +*Trestle was originally created by IBM.* diff --git a/ROADMAP.md b/ROADMAP.md index b2d2a70d8..370bf52c4 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -18,6 +18,12 @@ We use 12-week iterations for high-level initiatives that must be broken down an Each roadmap item is represented as a GitHub Issue. Discussions or any feedback on current roadmap items can take place in threads on the corresponding issue. To stay up to date with roadmap items, please join the OSCAL-Compass community [meetings](https://github.com/oscal-compass/community). +**Help Us Grow `compliance-trestle`!** Community contributions are essential to the project's success. To ensure we prioritize the most active and relevant issues, we're using `actions/stale` to automatically close older ones. Your participation is greatly appreciated! + +#### Our Triaging Process + +All new issues in `compliance-trestle` are added to the [project](https://github.com/orgs/oscal-compass/projects/2) with a status of New. All issues that need to be triaged are viewable [here](https://github.com/orgs/oscal-compass/projects/2/views/8). Once there is enough information to move forward on the issue, it can be moved to the `Backlog` by applying the `Backlog` label and moving the status to `Ready`. + ### How to add an item to the roadmap? **Contributors are encouraged to get feedback early by submitting issues to new work they would like to complete and getting feedback.** diff --git a/docs/api_reference/trestle.cli.md b/docs/api_reference/trestle.cli.md deleted file mode 100644 index 080aafc16..000000000 --- a/docs/api_reference/trestle.cli.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.cli -handler: python diff --git a/docs/api_reference/trestle.common.common_types.md b/docs/api_reference/trestle.common.common_types.md deleted file mode 100644 index fb2ec573e..000000000 --- a/docs/api_reference/trestle.common.common_types.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.common.common_types -handler: python diff --git a/docs/api_reference/trestle.common.const.md b/docs/api_reference/trestle.common.const.md deleted file mode 100644 index a3154cd2a..000000000 --- a/docs/api_reference/trestle.common.const.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.common.const -handler: python diff --git a/docs/api_reference/trestle.common.err.md b/docs/api_reference/trestle.common.err.md deleted file mode 100644 index d5e6fc24c..000000000 --- a/docs/api_reference/trestle.common.err.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.common.err -handler: python diff --git a/docs/api_reference/trestle.common.file_utils.md b/docs/api_reference/trestle.common.file_utils.md deleted file mode 100644 index cc91f9eed..000000000 --- a/docs/api_reference/trestle.common.file_utils.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.common.file_utils -handler: python diff --git a/docs/api_reference/trestle.common.list_utils.md b/docs/api_reference/trestle.common.list_utils.md deleted file mode 100644 index 2b2896a50..000000000 --- a/docs/api_reference/trestle.common.list_utils.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.common.list_utils -handler: python diff --git a/docs/api_reference/trestle.common.load_validate.md b/docs/api_reference/trestle.common.load_validate.md deleted file mode 100644 index bfae3172e..000000000 --- a/docs/api_reference/trestle.common.load_validate.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.common.load_validate -handler: python diff --git a/docs/api_reference/trestle.common.log.md b/docs/api_reference/trestle.common.log.md deleted file mode 100644 index 304daeb31..000000000 --- a/docs/api_reference/trestle.common.log.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.common.log -handler: python diff --git a/docs/api_reference/trestle.common.model_utils.md b/docs/api_reference/trestle.common.model_utils.md deleted file mode 100644 index d8172a023..000000000 --- a/docs/api_reference/trestle.common.model_utils.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.common.model_utils -handler: python diff --git a/docs/api_reference/trestle.common.str_utils.md b/docs/api_reference/trestle.common.str_utils.md deleted file mode 100644 index c8f11aec2..000000000 --- a/docs/api_reference/trestle.common.str_utils.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.common.str_utils -handler: python diff --git a/docs/api_reference/trestle.common.trash.md b/docs/api_reference/trestle.common.trash.md deleted file mode 100644 index c983d895f..000000000 --- a/docs/api_reference/trestle.common.trash.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.common.trash -handler: python diff --git a/docs/api_reference/trestle.common.type_utils.md b/docs/api_reference/trestle.common.type_utils.md deleted file mode 100644 index 9f989eac5..000000000 --- a/docs/api_reference/trestle.common.type_utils.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.common.type_utils -handler: python diff --git a/docs/api_reference/trestle.core.all_validator.md b/docs/api_reference/trestle.core.all_validator.md deleted file mode 100644 index 2608a44e2..000000000 --- a/docs/api_reference/trestle.core.all_validator.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.all_validator -handler: python diff --git a/docs/api_reference/trestle.core.base_model.md b/docs/api_reference/trestle.core.base_model.md deleted file mode 100644 index 951d7bec6..000000000 --- a/docs/api_reference/trestle.core.base_model.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.base_model -handler: python diff --git a/docs/api_reference/trestle.core.catalog.catalog_api.md b/docs/api_reference/trestle.core.catalog.catalog_api.md deleted file mode 100644 index 11b2fef15..000000000 --- a/docs/api_reference/trestle.core.catalog.catalog_api.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.catalog.catalog_api -handler: python diff --git a/docs/api_reference/trestle.core.catalog.catalog_interface.md b/docs/api_reference/trestle.core.catalog.catalog_interface.md deleted file mode 100644 index 145cac87b..000000000 --- a/docs/api_reference/trestle.core.catalog.catalog_interface.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.catalog.catalog_interface -handler: python diff --git a/docs/api_reference/trestle.core.catalog.catalog_merger.md b/docs/api_reference/trestle.core.catalog.catalog_merger.md deleted file mode 100644 index a2e43d8ba..000000000 --- a/docs/api_reference/trestle.core.catalog.catalog_merger.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.catalog.catalog_merger -handler: python diff --git a/docs/api_reference/trestle.core.catalog.catalog_reader.md b/docs/api_reference/trestle.core.catalog.catalog_reader.md deleted file mode 100644 index c3f3f9ad3..000000000 --- a/docs/api_reference/trestle.core.catalog.catalog_reader.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.catalog.catalog_reader -handler: python diff --git a/docs/api_reference/trestle.core.catalog.catalog_writer.md b/docs/api_reference/trestle.core.catalog.catalog_writer.md deleted file mode 100644 index 8b35a3068..000000000 --- a/docs/api_reference/trestle.core.catalog.catalog_writer.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.catalog.catalog_writer -handler: python diff --git a/docs/api_reference/trestle.core.catalog_validator.md b/docs/api_reference/trestle.core.catalog_validator.md deleted file mode 100644 index 462a9ca54..000000000 --- a/docs/api_reference/trestle.core.catalog_validator.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.catalog_validator -handler: python diff --git a/docs/api_reference/trestle.core.commands.add.md b/docs/api_reference/trestle.core.commands.add.md deleted file mode 100644 index 55ecbbc29..000000000 --- a/docs/api_reference/trestle.core.commands.add.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.add -handler: python diff --git a/docs/api_reference/trestle.core.commands.assemble.md b/docs/api_reference/trestle.core.commands.assemble.md deleted file mode 100644 index f52e4f5a0..000000000 --- a/docs/api_reference/trestle.core.commands.assemble.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.assemble -handler: python diff --git a/docs/api_reference/trestle.core.commands.author.catalog.md b/docs/api_reference/trestle.core.commands.author.catalog.md deleted file mode 100644 index 77e1a973c..000000000 --- a/docs/api_reference/trestle.core.commands.author.catalog.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.author.catalog -handler: python diff --git a/docs/api_reference/trestle.core.commands.author.command.md b/docs/api_reference/trestle.core.commands.author.command.md deleted file mode 100644 index 4aa7bdb2c..000000000 --- a/docs/api_reference/trestle.core.commands.author.command.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.author.command -handler: python diff --git a/docs/api_reference/trestle.core.commands.author.common.md b/docs/api_reference/trestle.core.commands.author.common.md deleted file mode 100644 index 0f1ac91bd..000000000 --- a/docs/api_reference/trestle.core.commands.author.common.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.author.common -handler: python diff --git a/docs/api_reference/trestle.core.commands.author.component.md b/docs/api_reference/trestle.core.commands.author.component.md deleted file mode 100644 index 2d810dbc9..000000000 --- a/docs/api_reference/trestle.core.commands.author.component.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.author.component -handler: python diff --git a/docs/api_reference/trestle.core.commands.author.consts.md b/docs/api_reference/trestle.core.commands.author.consts.md deleted file mode 100644 index 50787043d..000000000 --- a/docs/api_reference/trestle.core.commands.author.consts.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.author.consts -handler: python diff --git a/docs/api_reference/trestle.core.commands.author.docs.md b/docs/api_reference/trestle.core.commands.author.docs.md deleted file mode 100644 index cd462e3ab..000000000 --- a/docs/api_reference/trestle.core.commands.author.docs.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.author.docs -handler: python diff --git a/docs/api_reference/trestle.core.commands.author.folders.md b/docs/api_reference/trestle.core.commands.author.folders.md deleted file mode 100644 index f279754ee..000000000 --- a/docs/api_reference/trestle.core.commands.author.folders.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.author.folders -handler: python diff --git a/docs/api_reference/trestle.core.commands.author.headers.md b/docs/api_reference/trestle.core.commands.author.headers.md deleted file mode 100644 index 710a5afca..000000000 --- a/docs/api_reference/trestle.core.commands.author.headers.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.author.headers -handler: python diff --git a/docs/api_reference/trestle.core.commands.author.jinja.md b/docs/api_reference/trestle.core.commands.author.jinja.md deleted file mode 100644 index e642a2bb1..000000000 --- a/docs/api_reference/trestle.core.commands.author.jinja.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.author.jinja -handler: python diff --git a/docs/api_reference/trestle.core.commands.author.prof.md b/docs/api_reference/trestle.core.commands.author.prof.md deleted file mode 100644 index 9772b3103..000000000 --- a/docs/api_reference/trestle.core.commands.author.prof.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.author.prof -handler: python diff --git a/docs/api_reference/trestle.core.commands.author.ssp.md b/docs/api_reference/trestle.core.commands.author.ssp.md deleted file mode 100644 index 38e196f91..000000000 --- a/docs/api_reference/trestle.core.commands.author.ssp.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.author.ssp -handler: python diff --git a/docs/api_reference/trestle.core.commands.author.versioning.template_versioning.md b/docs/api_reference/trestle.core.commands.author.versioning.template_versioning.md deleted file mode 100644 index 2e39e44cb..000000000 --- a/docs/api_reference/trestle.core.commands.author.versioning.template_versioning.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.author.versioning.template_versioning -handler: python diff --git a/docs/api_reference/trestle.core.commands.command_docs.md b/docs/api_reference/trestle.core.commands.command_docs.md deleted file mode 100644 index 43942dc93..000000000 --- a/docs/api_reference/trestle.core.commands.command_docs.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.command_docs -handler: python diff --git a/docs/api_reference/trestle.core.commands.common.cmd_utils.md b/docs/api_reference/trestle.core.commands.common.cmd_utils.md deleted file mode 100644 index 6008f57da..000000000 --- a/docs/api_reference/trestle.core.commands.common.cmd_utils.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.common.cmd_utils -handler: python diff --git a/docs/api_reference/trestle.core.commands.common.return_codes.md b/docs/api_reference/trestle.core.commands.common.return_codes.md deleted file mode 100644 index 005b5f293..000000000 --- a/docs/api_reference/trestle.core.commands.common.return_codes.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.common.return_codes -handler: python diff --git a/docs/api_reference/trestle.core.commands.create.md b/docs/api_reference/trestle.core.commands.create.md deleted file mode 100644 index fc7790f41..000000000 --- a/docs/api_reference/trestle.core.commands.create.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.create -handler: python diff --git a/docs/api_reference/trestle.core.commands.describe.md b/docs/api_reference/trestle.core.commands.describe.md deleted file mode 100644 index b94aa284e..000000000 --- a/docs/api_reference/trestle.core.commands.describe.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.describe -handler: python diff --git a/docs/api_reference/trestle.core.commands.href.md b/docs/api_reference/trestle.core.commands.href.md deleted file mode 100644 index 7ca56c64e..000000000 --- a/docs/api_reference/trestle.core.commands.href.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.href -handler: python diff --git a/docs/api_reference/trestle.core.commands.import_.md b/docs/api_reference/trestle.core.commands.import_.md deleted file mode 100644 index 1544f9ba3..000000000 --- a/docs/api_reference/trestle.core.commands.import_.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.import_ -handler: python diff --git a/docs/api_reference/trestle.core.commands.init.md b/docs/api_reference/trestle.core.commands.init.md deleted file mode 100644 index 1ee989990..000000000 --- a/docs/api_reference/trestle.core.commands.init.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.init -handler: python diff --git a/docs/api_reference/trestle.core.commands.merge.md b/docs/api_reference/trestle.core.commands.merge.md deleted file mode 100644 index 02b4f29a9..000000000 --- a/docs/api_reference/trestle.core.commands.merge.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.merge -handler: python diff --git a/docs/api_reference/trestle.core.commands.partial_object_validate.md b/docs/api_reference/trestle.core.commands.partial_object_validate.md deleted file mode 100644 index cdae3aadc..000000000 --- a/docs/api_reference/trestle.core.commands.partial_object_validate.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.partial_object_validate -handler: python diff --git a/docs/api_reference/trestle.core.commands.remove.md b/docs/api_reference/trestle.core.commands.remove.md deleted file mode 100644 index ca5d3835f..000000000 --- a/docs/api_reference/trestle.core.commands.remove.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.remove -handler: python diff --git a/docs/api_reference/trestle.core.commands.replicate.md b/docs/api_reference/trestle.core.commands.replicate.md deleted file mode 100644 index 50d1538ed..000000000 --- a/docs/api_reference/trestle.core.commands.replicate.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.replicate -handler: python diff --git a/docs/api_reference/trestle.core.commands.split.md b/docs/api_reference/trestle.core.commands.split.md deleted file mode 100644 index 0c58b4a40..000000000 --- a/docs/api_reference/trestle.core.commands.split.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.split -handler: python diff --git a/docs/api_reference/trestle.core.commands.task.md b/docs/api_reference/trestle.core.commands.task.md deleted file mode 100644 index 74758b62f..000000000 --- a/docs/api_reference/trestle.core.commands.task.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.task -handler: python diff --git a/docs/api_reference/trestle.core.commands.validate.md b/docs/api_reference/trestle.core.commands.validate.md deleted file mode 100644 index 00a74f64f..000000000 --- a/docs/api_reference/trestle.core.commands.validate.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.validate -handler: python diff --git a/docs/api_reference/trestle.core.commands.version.md b/docs/api_reference/trestle.core.commands.version.md deleted file mode 100644 index f50c1c988..000000000 --- a/docs/api_reference/trestle.core.commands.version.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.commands.version -handler: python diff --git a/docs/api_reference/trestle.core.control_context.md b/docs/api_reference/trestle.core.control_context.md deleted file mode 100644 index 5527911a4..000000000 --- a/docs/api_reference/trestle.core.control_context.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.control_context -handler: python diff --git a/docs/api_reference/trestle.core.control_interface.md b/docs/api_reference/trestle.core.control_interface.md deleted file mode 100644 index 2293ca6e2..000000000 --- a/docs/api_reference/trestle.core.control_interface.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.control_interface -handler: python diff --git a/docs/api_reference/trestle.core.control_reader.md b/docs/api_reference/trestle.core.control_reader.md deleted file mode 100644 index 5c74a7f99..000000000 --- a/docs/api_reference/trestle.core.control_reader.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.control_reader -handler: python diff --git a/docs/api_reference/trestle.core.control_writer.md b/docs/api_reference/trestle.core.control_writer.md deleted file mode 100644 index f481b81cb..000000000 --- a/docs/api_reference/trestle.core.control_writer.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.control_writer -handler: python diff --git a/docs/api_reference/trestle.core.crm.bycomp_interface.md b/docs/api_reference/trestle.core.crm.bycomp_interface.md deleted file mode 100644 index a6bc38dde..000000000 --- a/docs/api_reference/trestle.core.crm.bycomp_interface.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.crm.bycomp_interface -handler: python diff --git a/docs/api_reference/trestle.core.crm.export_reader.md b/docs/api_reference/trestle.core.crm.export_reader.md deleted file mode 100644 index 27301c488..000000000 --- a/docs/api_reference/trestle.core.crm.export_reader.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.crm.export_reader -handler: python diff --git a/docs/api_reference/trestle.core.crm.export_writer.md b/docs/api_reference/trestle.core.crm.export_writer.md deleted file mode 100644 index 311b57102..000000000 --- a/docs/api_reference/trestle.core.crm.export_writer.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.crm.export_writer -handler: python diff --git a/docs/api_reference/trestle.core.crm.leveraged_statements.md b/docs/api_reference/trestle.core.crm.leveraged_statements.md deleted file mode 100644 index 943d725f1..000000000 --- a/docs/api_reference/trestle.core.crm.leveraged_statements.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.crm.leveraged_statements -handler: python diff --git a/docs/api_reference/trestle.core.crm.ssp_inheritance_api.md b/docs/api_reference/trestle.core.crm.ssp_inheritance_api.md deleted file mode 100644 index 74d3c7457..000000000 --- a/docs/api_reference/trestle.core.crm.ssp_inheritance_api.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.crm.ssp_inheritance_api -handler: python diff --git a/docs/api_reference/trestle.core.docs_control_writer.md b/docs/api_reference/trestle.core.docs_control_writer.md deleted file mode 100644 index 2e36eb172..000000000 --- a/docs/api_reference/trestle.core.docs_control_writer.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.docs_control_writer -handler: python diff --git a/docs/api_reference/trestle.core.draw_io.md b/docs/api_reference/trestle.core.draw_io.md deleted file mode 100644 index 39c89b19d..000000000 --- a/docs/api_reference/trestle.core.draw_io.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.draw_io -handler: python diff --git a/docs/api_reference/trestle.core.duplicates_validator.md b/docs/api_reference/trestle.core.duplicates_validator.md deleted file mode 100644 index 65ef50294..000000000 --- a/docs/api_reference/trestle.core.duplicates_validator.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.duplicates_validator -handler: python diff --git a/docs/api_reference/trestle.core.generators.md b/docs/api_reference/trestle.core.generators.md deleted file mode 100644 index e15d7f25c..000000000 --- a/docs/api_reference/trestle.core.generators.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.generators -handler: python diff --git a/docs/api_reference/trestle.core.generic_oscal.md b/docs/api_reference/trestle.core.generic_oscal.md deleted file mode 100644 index 295f63592..000000000 --- a/docs/api_reference/trestle.core.generic_oscal.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.generic_oscal -handler: python diff --git a/docs/api_reference/trestle.core.jinja.md b/docs/api_reference/trestle.core.jinja.md deleted file mode 100644 index ea057f7e1..000000000 --- a/docs/api_reference/trestle.core.jinja.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.jinja -handler: python diff --git a/docs/api_reference/trestle.core.links_validator.md b/docs/api_reference/trestle.core.links_validator.md deleted file mode 100644 index 582d34b34..000000000 --- a/docs/api_reference/trestle.core.links_validator.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.links_validator -handler: python diff --git a/docs/api_reference/trestle.core.markdown.base_markdown_node.md b/docs/api_reference/trestle.core.markdown.base_markdown_node.md deleted file mode 100644 index 4dc3f453c..000000000 --- a/docs/api_reference/trestle.core.markdown.base_markdown_node.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.markdown.base_markdown_node -handler: python diff --git a/docs/api_reference/trestle.core.markdown.control_markdown_node.md b/docs/api_reference/trestle.core.markdown.control_markdown_node.md deleted file mode 100644 index 51d37efbb..000000000 --- a/docs/api_reference/trestle.core.markdown.control_markdown_node.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.markdown.control_markdown_node -handler: python diff --git a/docs/api_reference/trestle.core.markdown.docs_markdown_node.md b/docs/api_reference/trestle.core.markdown.docs_markdown_node.md deleted file mode 100644 index 171b3e6c6..000000000 --- a/docs/api_reference/trestle.core.markdown.docs_markdown_node.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.markdown.docs_markdown_node -handler: python diff --git a/docs/api_reference/trestle.core.markdown.markdown_api.md b/docs/api_reference/trestle.core.markdown.markdown_api.md deleted file mode 100644 index f3d623761..000000000 --- a/docs/api_reference/trestle.core.markdown.markdown_api.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.markdown.markdown_api -handler: python diff --git a/docs/api_reference/trestle.core.markdown.markdown_const.md b/docs/api_reference/trestle.core.markdown.markdown_const.md deleted file mode 100644 index e7d7c6629..000000000 --- a/docs/api_reference/trestle.core.markdown.markdown_const.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.markdown.markdown_const -handler: python diff --git a/docs/api_reference/trestle.core.markdown.markdown_processor.md b/docs/api_reference/trestle.core.markdown.markdown_processor.md deleted file mode 100644 index c2678c8f5..000000000 --- a/docs/api_reference/trestle.core.markdown.markdown_processor.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.markdown.markdown_processor -handler: python diff --git a/docs/api_reference/trestle.core.markdown.markdown_validator.md b/docs/api_reference/trestle.core.markdown.markdown_validator.md deleted file mode 100644 index 576d1b8c7..000000000 --- a/docs/api_reference/trestle.core.markdown.markdown_validator.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.markdown.markdown_validator -handler: python diff --git a/docs/api_reference/trestle.core.markdown.md_writer.md b/docs/api_reference/trestle.core.markdown.md_writer.md deleted file mode 100644 index 6d3fc165b..000000000 --- a/docs/api_reference/trestle.core.markdown.md_writer.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.markdown.md_writer -handler: python diff --git a/docs/api_reference/trestle.core.models.actions.md b/docs/api_reference/trestle.core.models.actions.md deleted file mode 100644 index fa8dcc840..000000000 --- a/docs/api_reference/trestle.core.models.actions.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.models.actions -handler: python diff --git a/docs/api_reference/trestle.core.models.elements.md b/docs/api_reference/trestle.core.models.elements.md deleted file mode 100644 index 62cfe699c..000000000 --- a/docs/api_reference/trestle.core.models.elements.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.models.elements -handler: python diff --git a/docs/api_reference/trestle.core.models.file_content_type.md b/docs/api_reference/trestle.core.models.file_content_type.md deleted file mode 100644 index 4007ae0ff..000000000 --- a/docs/api_reference/trestle.core.models.file_content_type.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.models.file_content_type -handler: python diff --git a/docs/api_reference/trestle.core.models.interfaces.md b/docs/api_reference/trestle.core.models.interfaces.md deleted file mode 100644 index ccd730ff1..000000000 --- a/docs/api_reference/trestle.core.models.interfaces.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.models.interfaces -handler: python diff --git a/docs/api_reference/trestle.core.models.plans.md b/docs/api_reference/trestle.core.models.plans.md deleted file mode 100644 index 9e4111313..000000000 --- a/docs/api_reference/trestle.core.models.plans.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.models.plans -handler: python diff --git a/docs/api_reference/trestle.core.object_factory.md b/docs/api_reference/trestle.core.object_factory.md deleted file mode 100644 index fadd987ce..000000000 --- a/docs/api_reference/trestle.core.object_factory.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.object_factory -handler: python diff --git a/docs/api_reference/trestle.core.parser.md b/docs/api_reference/trestle.core.parser.md deleted file mode 100644 index 931c6dfd1..000000000 --- a/docs/api_reference/trestle.core.parser.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.parser -handler: python diff --git a/docs/api_reference/trestle.core.pipeline.md b/docs/api_reference/trestle.core.pipeline.md deleted file mode 100644 index 27405ff4e..000000000 --- a/docs/api_reference/trestle.core.pipeline.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.pipeline -handler: python diff --git a/docs/api_reference/trestle.core.profile_resolver.md b/docs/api_reference/trestle.core.profile_resolver.md deleted file mode 100644 index 555fc223f..000000000 --- a/docs/api_reference/trestle.core.profile_resolver.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.profile_resolver -handler: python diff --git a/docs/api_reference/trestle.core.refs_validator.md b/docs/api_reference/trestle.core.refs_validator.md deleted file mode 100644 index 99be888d1..000000000 --- a/docs/api_reference/trestle.core.refs_validator.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.refs_validator -handler: python diff --git a/docs/api_reference/trestle.core.remote.cache.md b/docs/api_reference/trestle.core.remote.cache.md deleted file mode 100644 index 4ef6965c6..000000000 --- a/docs/api_reference/trestle.core.remote.cache.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.remote.cache -handler: python diff --git a/docs/api_reference/trestle.core.repository.md b/docs/api_reference/trestle.core.repository.md deleted file mode 100644 index 0019976d5..000000000 --- a/docs/api_reference/trestle.core.repository.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.repository -handler: python diff --git a/docs/api_reference/trestle.core.resolver.merge.md b/docs/api_reference/trestle.core.resolver.merge.md deleted file mode 100644 index 909aee8fe..000000000 --- a/docs/api_reference/trestle.core.resolver.merge.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.resolver.merge -handler: python diff --git a/docs/api_reference/trestle.core.resolver.modify.md b/docs/api_reference/trestle.core.resolver.modify.md deleted file mode 100644 index 902a127c6..000000000 --- a/docs/api_reference/trestle.core.resolver.modify.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.resolver.modify -handler: python diff --git a/docs/api_reference/trestle.core.resolver.prune.md b/docs/api_reference/trestle.core.resolver.prune.md deleted file mode 100644 index a0ac986ca..000000000 --- a/docs/api_reference/trestle.core.resolver.prune.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.resolver.prune -handler: python diff --git a/docs/api_reference/trestle.core.rule_parameters_validator.md b/docs/api_reference/trestle.core.rule_parameters_validator.md deleted file mode 100644 index 061a96199..000000000 --- a/docs/api_reference/trestle.core.rule_parameters_validator.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.rule_parameters_validator -handler: python diff --git a/docs/api_reference/trestle.core.ssp_io.md b/docs/api_reference/trestle.core.ssp_io.md deleted file mode 100644 index 6997902ad..000000000 --- a/docs/api_reference/trestle.core.ssp_io.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.ssp_io -handler: python diff --git a/docs/api_reference/trestle.core.trestle_base_model.md b/docs/api_reference/trestle.core.trestle_base_model.md deleted file mode 100644 index 5dc76406b..000000000 --- a/docs/api_reference/trestle.core.trestle_base_model.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.trestle_base_model -handler: python diff --git a/docs/api_reference/trestle.core.validator.md b/docs/api_reference/trestle.core.validator.md deleted file mode 100644 index e7904faf3..000000000 --- a/docs/api_reference/trestle.core.validator.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.validator -handler: python diff --git a/docs/api_reference/trestle.core.validator_factory.md b/docs/api_reference/trestle.core.validator_factory.md deleted file mode 100644 index 2a714127e..000000000 --- a/docs/api_reference/trestle.core.validator_factory.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.core.validator_factory -handler: python diff --git a/docs/api_reference/trestle.oscal.assessment_plan.md b/docs/api_reference/trestle.oscal.assessment_plan.md deleted file mode 100644 index 24ecd2b0d..000000000 --- a/docs/api_reference/trestle.oscal.assessment_plan.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.oscal.assessment_plan -handler: python diff --git a/docs/api_reference/trestle.oscal.assessment_results.md b/docs/api_reference/trestle.oscal.assessment_results.md deleted file mode 100644 index c88c2c87b..000000000 --- a/docs/api_reference/trestle.oscal.assessment_results.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.oscal.assessment_results -handler: python diff --git a/docs/api_reference/trestle.oscal.catalog.md b/docs/api_reference/trestle.oscal.catalog.md deleted file mode 100644 index be5d09b30..000000000 --- a/docs/api_reference/trestle.oscal.catalog.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.oscal.catalog -handler: python diff --git a/docs/api_reference/trestle.oscal.common.md b/docs/api_reference/trestle.oscal.common.md deleted file mode 100644 index 3b03df739..000000000 --- a/docs/api_reference/trestle.oscal.common.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.oscal.common -handler: python diff --git a/docs/api_reference/trestle.oscal.component.md b/docs/api_reference/trestle.oscal.component.md deleted file mode 100644 index b6eac56d6..000000000 --- a/docs/api_reference/trestle.oscal.component.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.oscal.component -handler: python diff --git a/docs/api_reference/trestle.oscal.poam.md b/docs/api_reference/trestle.oscal.poam.md deleted file mode 100644 index b145be49a..000000000 --- a/docs/api_reference/trestle.oscal.poam.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.oscal.poam -handler: python diff --git a/docs/api_reference/trestle.oscal.profile.md b/docs/api_reference/trestle.oscal.profile.md deleted file mode 100644 index 13d10e9a9..000000000 --- a/docs/api_reference/trestle.oscal.profile.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.oscal.profile -handler: python diff --git a/docs/api_reference/trestle.oscal.ssp.md b/docs/api_reference/trestle.oscal.ssp.md deleted file mode 100644 index 81d74c04d..000000000 --- a/docs/api_reference/trestle.oscal.ssp.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.oscal.ssp -handler: python diff --git a/docs/api_reference/trestle.tasks.base_task.md b/docs/api_reference/trestle.tasks.base_task.md deleted file mode 100644 index 90338a062..000000000 --- a/docs/api_reference/trestle.tasks.base_task.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.base_task -handler: python diff --git a/docs/api_reference/trestle.tasks.cis_xlsx_to_oscal_catalog.md b/docs/api_reference/trestle.tasks.cis_xlsx_to_oscal_catalog.md deleted file mode 100644 index e283e136f..000000000 --- a/docs/api_reference/trestle.tasks.cis_xlsx_to_oscal_catalog.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.cis_xlsx_to_oscal_catalog -handler: python diff --git a/docs/api_reference/trestle.tasks.csv_to_oscal_cd.md b/docs/api_reference/trestle.tasks.csv_to_oscal_cd.md deleted file mode 100644 index 8bf76f406..000000000 --- a/docs/api_reference/trestle.tasks.csv_to_oscal_cd.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.csv_to_oscal_cd -handler: python diff --git a/docs/api_reference/trestle.tasks.ocp4_cis_profile_to_oscal_catalog.md b/docs/api_reference/trestle.tasks.ocp4_cis_profile_to_oscal_catalog.md deleted file mode 100644 index a42d2a5c4..000000000 --- a/docs/api_reference/trestle.tasks.ocp4_cis_profile_to_oscal_catalog.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.ocp4_cis_profile_to_oscal_catalog -handler: python diff --git a/docs/api_reference/trestle.tasks.ocp4_cis_profile_to_oscal_cd.md b/docs/api_reference/trestle.tasks.ocp4_cis_profile_to_oscal_cd.md deleted file mode 100644 index dd8d03ccd..000000000 --- a/docs/api_reference/trestle.tasks.ocp4_cis_profile_to_oscal_cd.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.ocp4_cis_profile_to_oscal_cd -handler: python diff --git a/docs/api_reference/trestle.tasks.oscal_catalog_to_csv.md b/docs/api_reference/trestle.tasks.oscal_catalog_to_csv.md deleted file mode 100644 index af67ad272..000000000 --- a/docs/api_reference/trestle.tasks.oscal_catalog_to_csv.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.oscal_catalog_to_csv -handler: python diff --git a/docs/api_reference/trestle.tasks.oscal_profile_to_osco_profile.md b/docs/api_reference/trestle.tasks.oscal_profile_to_osco_profile.md deleted file mode 100644 index eeef5dbf3..000000000 --- a/docs/api_reference/trestle.tasks.oscal_profile_to_osco_profile.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.oscal_profile_to_osco_profile -handler: python diff --git a/docs/api_reference/trestle.tasks.osco_result_to_oscal_ar.md b/docs/api_reference/trestle.tasks.osco_result_to_oscal_ar.md deleted file mode 100644 index fbdfed04a..000000000 --- a/docs/api_reference/trestle.tasks.osco_result_to_oscal_ar.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.osco_result_to_oscal_ar -handler: python diff --git a/docs/api_reference/trestle.tasks.tanium_result_to_oscal_ar.md b/docs/api_reference/trestle.tasks.tanium_result_to_oscal_ar.md deleted file mode 100644 index a26d33706..000000000 --- a/docs/api_reference/trestle.tasks.tanium_result_to_oscal_ar.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.tanium_result_to_oscal_ar -handler: python diff --git a/docs/api_reference/trestle.tasks.transform.md b/docs/api_reference/trestle.tasks.transform.md deleted file mode 100644 index 2ba6d95bc..000000000 --- a/docs/api_reference/trestle.tasks.transform.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.transform -handler: python diff --git a/docs/api_reference/trestle.tasks.xccdf_result_to_oscal_ar.md b/docs/api_reference/trestle.tasks.xccdf_result_to_oscal_ar.md deleted file mode 100644 index a81c9eb73..000000000 --- a/docs/api_reference/trestle.tasks.xccdf_result_to_oscal_ar.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.xccdf_result_to_oscal_ar -handler: python diff --git a/docs/api_reference/trestle.tasks.xlsx_helper.md b/docs/api_reference/trestle.tasks.xlsx_helper.md deleted file mode 100644 index 7014b04fd..000000000 --- a/docs/api_reference/trestle.tasks.xlsx_helper.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.xlsx_helper -handler: python diff --git a/docs/api_reference/trestle.tasks.xlsx_to_oscal_cd.md b/docs/api_reference/trestle.tasks.xlsx_to_oscal_cd.md deleted file mode 100644 index eaef1b196..000000000 --- a/docs/api_reference/trestle.tasks.xlsx_to_oscal_cd.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.xlsx_to_oscal_cd -handler: python diff --git a/docs/api_reference/trestle.tasks.xlsx_to_oscal_profile.md b/docs/api_reference/trestle.tasks.xlsx_to_oscal_profile.md deleted file mode 100644 index 034ddb87a..000000000 --- a/docs/api_reference/trestle.tasks.xlsx_to_oscal_profile.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.tasks.xlsx_to_oscal_profile -handler: python diff --git a/docs/api_reference/trestle.transforms.implementations.osco.md b/docs/api_reference/trestle.transforms.implementations.osco.md deleted file mode 100644 index 9fb600ea6..000000000 --- a/docs/api_reference/trestle.transforms.implementations.osco.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.transforms.implementations.osco -handler: python diff --git a/docs/api_reference/trestle.transforms.implementations.tanium.md b/docs/api_reference/trestle.transforms.implementations.tanium.md deleted file mode 100644 index c016bb8fd..000000000 --- a/docs/api_reference/trestle.transforms.implementations.tanium.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.transforms.implementations.tanium -handler: python diff --git a/docs/api_reference/trestle.transforms.implementations.xccdf.md b/docs/api_reference/trestle.transforms.implementations.xccdf.md deleted file mode 100644 index c0a277f4b..000000000 --- a/docs/api_reference/trestle.transforms.implementations.xccdf.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.transforms.implementations.xccdf -handler: python diff --git a/docs/api_reference/trestle.transforms.results.md b/docs/api_reference/trestle.transforms.results.md deleted file mode 100644 index 5302e0c27..000000000 --- a/docs/api_reference/trestle.transforms.results.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.transforms.results -handler: python diff --git a/docs/api_reference/trestle.transforms.transformer_factory.md b/docs/api_reference/trestle.transforms.transformer_factory.md deleted file mode 100644 index bdcb9a0dd..000000000 --- a/docs/api_reference/trestle.transforms.transformer_factory.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.transforms.transformer_factory -handler: python diff --git a/docs/api_reference/trestle.transforms.transformer_helper.md b/docs/api_reference/trestle.transforms.transformer_helper.md deleted file mode 100644 index 5b2c0385b..000000000 --- a/docs/api_reference/trestle.transforms.transformer_helper.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.transforms.transformer_helper -handler: python diff --git a/docs/api_reference/trestle.transforms.transformer_singleton.md b/docs/api_reference/trestle.transforms.transformer_singleton.md deleted file mode 100644 index 723e80e16..000000000 --- a/docs/api_reference/trestle.transforms.transformer_singleton.md +++ /dev/null @@ -1,2 +0,0 @@ -::: trestle.transforms.transformer_singleton -handler: python diff --git a/docs/assets/favicon.ico b/docs/assets/favicon.ico new file mode 100644 index 000000000..fc00960cc Binary files /dev/null and b/docs/assets/favicon.ico differ diff --git a/docs/contributing/.pages b/docs/contributing/.pages new file mode 100644 index 000000000..545a6ae75 --- /dev/null +++ b/docs/contributing/.pages @@ -0,0 +1,10 @@ +nav: +- Overview: index.md +- Code of Conduct: code_of_conduct.md +- OSCAL object model: oscal_object_model.md +- Website development: website.md +- Developing trestle plugins: plugins.md +- Contributors: https://github.com/oscal-compass/compliance-trestle/graphs/contributors +- Maintainers: maintainers.md +- Developer Certificate of Originality: DCO.md +- GitHub actions: github_actions_setup.md diff --git a/docs/contributing/code_of_conduct.md b/docs/contributing/code_of_conduct.md new file mode 100644 index 000000000..9b1d7bc1e --- /dev/null +++ b/docs/contributing/code_of_conduct.md @@ -0,0 +1,8 @@ +--- +title: Code of conduct +description: Code of conduct for engaging with the compliance trestle community +--- + +# Code of Conduct + +Please refer to our [OSCAL Compass Community Code of Conduct](https://github.com/oscal-compass/community/blob/main/CODE_OF_CONDUCT.md). diff --git a/docs/contributing/github_actions_setup.md b/docs/contributing/github_actions_setup.md index 8cf0bbb8f..a000faf15 100644 --- a/docs/contributing/github_actions_setup.md +++ b/docs/contributing/github_actions_setup.md @@ -1,19 +1,21 @@ +--- +title: Setting up GitHub actions +description: Setting up github actions for a fork of compliance trestle for development +--- + # Github actions setup Github actions contains variables which have opaque values to a user. -The variables are documented here such that trestle can be setup on a fork etc. +The variables are documented here such that trestle can be setup on a fork for independent development. +This is not required to open a pull request against the compliance-trestle project. +Project maintainers, after an initial review, will allow github actions workflows to run. ## Secrets -- `ADMIN_PAT`: Github PAT with sufficient write access to merge content into `develop` and commit to `gh-pages` and `main` +- `APP_ID` and `PRIVATE_KEY`: GitHub App information with sufficient write access to merge content into `develop` and commit to `gh-pages` and `main` - `SONAR_TOKEN`: Token to sonarcloud with rights to the appropriate project. -## Repository level variables - -- `PYTHON_MIN`: Minimum test version of python e.g. `3.9` -- `PYTHON_MAX`: Maxmimum test version of python e.g. `3.11` - ## Authorization with pypi Pypi authorization must be setup following the procedure in the following documents diff --git a/docs/contributing/images/trestle-OSCAL-upgrade.png b/docs/contributing/images/trestle-OSCAL-upgrade.png new file mode 100644 index 000000000..63e73799f Binary files /dev/null and b/docs/contributing/images/trestle-OSCAL-upgrade.png differ diff --git a/docs/contributing/index.md b/docs/contributing/index.md new file mode 100644 index 000000000..64e74dcd9 --- /dev/null +++ b/docs/contributing/index.md @@ -0,0 +1,6 @@ +--- +title: Overview +description: "An overview of tools and processes for contributing to compliance-trestle" +--- + +{!CONTRIBUTING.md!} diff --git a/docs/contributing/maintainers.md b/docs/contributing/maintainers.md new file mode 100644 index 000000000..2d76357f8 --- /dev/null +++ b/docs/contributing/maintainers.md @@ -0,0 +1,6 @@ +--- +title: Maintainers +description: "The list of maintainers of compliance-trestle" +--- + +{!MAINTAINERS.md!} diff --git a/docs/contributing/mkdocs_contributing.md b/docs/contributing/mkdocs_contributing.md deleted file mode 100644 index 66e8e2b46..000000000 --- a/docs/contributing/mkdocs_contributing.md +++ /dev/null @@ -1 +0,0 @@ -{!CONTRIBUTING.md!} diff --git a/docs/contributing/trestle_oscal_object_model.md b/docs/contributing/oscal_object_model.md similarity index 93% rename from docs/contributing/trestle_oscal_object_model.md rename to docs/contributing/oscal_object_model.md index 71083d6d2..7f4c4ccf3 100644 --- a/docs/contributing/trestle_oscal_object_model.md +++ b/docs/contributing/oscal_object_model.md @@ -1,3 +1,8 @@ +--- +title: Trestle's oscal object model +description: How to use trestle as an object model for OSCAL +--- + # Using trestle as an object model for OSCAL Trestle provides an object model for OSCAL to ease the development and validation of OSCAL objects that reside in the `trestle.oscal` module. @@ -9,7 +14,7 @@ This functionality, which is built on [pydantic](https://pydantic-docs.helpmanua ## Mapping and variance with OSCAL names. -The underlying object model that trestle relies on is the json schema published by NIST [here](https://github.com/usnistgov/OSCAL/tree/main/json/schema). In understanding these models the [model reference page](https://pages.nist.gov/OSCAL/reference/1.0.0/) is an indispensable source. +The underlying object model that trestle relies on is the json schema published by NIST [here](https://github.com/usnistgov/OSCAL/releases/latest). In understanding these models the [model reference page](https://pages.nist.gov/OSCAL-Reference/models/) is an indispensable source. When generating the python data class based models we have tried to be as faithful as we can to the naming convention provided by OSCAL. This is the hierarchy of rules that we have used: diff --git a/docs/contributing/plugins.md b/docs/contributing/plugins.md index f4f7d6582..d5296df62 100644 --- a/docs/contributing/plugins.md +++ b/docs/contributing/plugins.md @@ -1,3 +1,8 @@ +--- +title: Developing trestle plugins +description: Trestle provides a mechanism for 3rd party providers to extend its command interface via a plugin architecture. This describes to build a trestle plugin. +--- + # Adding plugins to trestle Trestle provides a mechanism for 3rd party providers to extend its command interface via a plugin architecture. All trestle plugins that conforms to this specification will be automatically discovered by trestle if installed, and their command(s) will be added to trestle sub-commands list. Below we describe this plugin mechanism with the help of an example plugin [`compliance-trestle-fedramp`](https://github.com/oscal-compass/compliance-trestle-fedramp) that we created as a separate python project that can be installed via `pip`. @@ -13,17 +18,22 @@ The plugin project should be organized as shown below. ```text compliance-trestle-fedramp ├── trestle_fedramp -│ ├── __init.py__ +│ ├── __init__.py │ ├── commands -| | ├── __init.py__ +| | ├── __init__.py | | ├── validate.py +| ├── jinja_ext +| | ├── __init__.py +| | ├── filters.py │ ├── ├── ``` Trestle uses a naming convention to discover the top-level module of the plugin projects. It expects the top-level module to be named `trestle_{plugin_name}`. This covention must be followed by plugins to be discoverable by trestle. In the above example, the top-level module is named as `trestle_fedramp` so that it can be autmatically discovered by trestle. All the python source files should be created inside this module (folder). -The top-evel module should contain a `commands` directory where all the plugin command files should be stored. Each command should have its own python file. In the above exaample, `validate.py` file conatins one command for this plugin. Other python files or folders should be created in the top-level module folder, outside the `commands` folder. This helps in keeping the commands separate and in their discovery by trestle. +To add commands to the CLI interface, the top-level module should contain a `commands` directory where all the plugin command files should be stored. Each command should have its own python file. In the above example, `validate.py` file contains one command for this plugin. Other python files or folders should be created in the top-level module folder, outside the `commands` folder. This helps in keeping the commands separate and in their discovery by trestle. + +To add jinja extensions available during `trestle author jinja`, the top-level module should contain a `jinja_ext` directory where all extension files should be stored. Each extension should have its own python file. In the above example, `filters.py` file contains a single extension class, which may define many filters or custom tags. Supporting code should be created in the top-level module folder, outside the `jinja_ext` folder. This helps in keeping the extensions separate and in their discovery by trestle. ## Command Creation @@ -61,3 +71,28 @@ There should be a command class for example, `ValidateCmd` which should either e The docstring of the command class is used as the help message for the command. Input arguments to the command should be specified in `_init_arguments` method as shown above. The acutal code of the command is contained in`_run` method. This method is called by ilcli when the command is excuted on the commandline. The command arguments can be accessed from the `args` input parameter as shown above. The command should return `0` in case of successful execution, or any number greater than 0 in case of failure. Please see `trestle.core.commands.common.return_codes.CmdReturnCodes` class for specific return codes in case of failure. The command class should conatin the `name` field which should be set to the desired command name. In the above example, the command is called `fedramp-validate`. This name is automatically added to the list of sub-command names of trestle during the plugin discovery process. This command can then be invoked as `trestle {name}` from the commandline e.g., `trestle fedramp-validate`. Any input parameters to the command can also be passed on the commandline after the command name. + +## Jinja Extension Creation + +The plugin extension should be created as shown in the below code snippet. + +```python +from jinja2 import Environment +from trestle.core.jinja.base import TrestleJinjaExtension + +def _mark_tktk(value: str) -> str: + """Mark a value with TKTK to easily find it for future revision.""" + return f'TKTK {value} TKTK' + + +class Filters(TrestleJinjaExtension): + def __init__(self, environment: Environment) -> None: + super(Filters, self).__init__(environment) + + environment.filters['tktk'] = _mark_tktk + +``` + +There should be an extension class, for example `Filters` that must extend from `TrestleJinjaExtension` or `jinja2.ext.Extention`. The `__init__` method must call init for its superclass. Beyond that, any behavior for standard [jinja2 custom extensions](https://jinja.palletsprojects.com/en/3.1.x/extensions/#module-jinja2.ext) is supported. + +Examples for implementing extensions can be found at `trestle/core/jinja/tags.py` and `trestle/core/jinja/filters.py` diff --git a/docs/contributing/website.md b/docs/contributing/website.md index 4dfbbc7c4..863cd34c3 100644 --- a/docs/contributing/website.md +++ b/docs/contributing/website.md @@ -1,3 +1,8 @@ +--- +title: Documentation website +description: Describes how to contribute to and build the documentation website for compliance trestle +--- + # Developing for the trestle documentation website This page describes the developing for the trestle (website) which is deployed at https://oscal-compass.github.io/compliance-trestle. @@ -11,7 +16,6 @@ The current documentation website build reuses some of these files, specifically - Contents of `README.md` - Entirety of `LICENSE` - Entirety of `CONTRIBUTING.md` -- Entirety of `CODE_OF_CONDUCT.md` - Entirety of `CHANGELOG.md` - Entirely of `MAINTAINERS.md` - Entirely of `DCO1.1.txt` diff --git a/docs/demonstrations-content.md b/docs/demos.md similarity index 96% rename from docs/demonstrations-content.md rename to docs/demos.md index c2059d9ce..310e35c58 100644 --- a/docs/demonstrations-content.md +++ b/docs/demos.md @@ -1,3 +1,8 @@ +--- +title: Demos +description: List of different demonstrations of compliance trestle +--- + # Trestle demonstration projects and content Trestle has a number of demonstrations setup in the @@ -7,7 +12,7 @@ content. If you are interested in contributing a demonstration / content open a PR to the demonstration repo and a PR to -[this page](https://github.com/oscal-compass/compliance-trestle/blob/develop/docs/demonstrations-content.md). +[this page](https://github.com/oscal-compass/compliance-trestle/blob/develop/docs/demos.md). Demonstrations, where practical, should include instructions on how they were created. diff --git a/docs/index.md b/docs/index.md index bee864d33..62b14bdc2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,3 +1,8 @@ +--- +title: Overview +description: Trestle is an ensemble of tools that enable the creation, validation, and governance of documentation artifacts for compliance needs +--- + # Compliance-trestle (also known as `trestle`) ![[OS Compatibility](#prerequisites)](https://img.shields.io/badge/platform-osx%20%7C%20linux%20%7C%20windows-orange.svg) @@ -6,7 +11,7 @@ ![[Code Coverage](https://sonarcloud.io/dashboard?id=compliance-trestle)](https://sonarcloud.io/api/project_badges/measure?project=compliance-trestle&metric=coverage) ![[Quality gate](https://sonarcloud.io/dashboard?id=compliance-trestle)](https://sonarcloud.io/api/project_badges/measure?project=compliance-trestle&metric=alert_status) ![[Pypi](https://pypi.org/project/compliance-trestle/)](https://img.shields.io/pypi/dm/compliance-trestle) -![GitHub Actions status](https://img.shields.io/github/workflow/status/oscal-compass/compliance-trestle/Trestle%20PR%20pipeline?event=push) +![GitHub Actions status](https://github.com/oscal-compass/compliance-trestle/actions/workflows/python-test.yml/badge.svg?branch=develop) Trestle is an ensemble of tools that enable the creation, validation, and governance of documentation artifacts for compliance needs. It leverages NIST's [OSCAL](https://pages.nist.gov/OSCAL/documentation/) as a standard data format for interchange between tools and people, and provides an opinionated approach to OSCAL adoption. @@ -65,7 +70,7 @@ natively supports only `json` and `yaml` formats at this time. Future roadmap anticipates that support for xml [import](https://github.com/oscal-compass/compliance-trestle/issues/177) and [upstream references](https://github.com/oscal-compass/compliance-trestle/issues/178) will be enabled. However, it is expected that full support will remain only for `json` and `yaml`. -Users needing to import XML OSCAL artifacts are recommended to look at NIST's XML to json conversion page [here](https://github.com/usnistgov/OSCAL/tree/master/json#oscal-xml-to-json-converters). +Users needing to import XML OSCAL artifacts are recommended to look at NIST's OSCAL converters page [here](https://github.com/usnistgov/OSCAL/blob/main/build/README.md#converters). ## Python codebase, easy installation via pip @@ -77,15 +82,15 @@ Compliance trestle is currently stable and is based on NIST OSCAL version 1.0.4, ## Contributing to Trestle -Our project welcomes external contributions. Please consult [contributing](contributing/mkdocs_contributing/) to get started. +Our project welcomes external contributions. Please consult [contributing](contributing/index.md) to get started. ## License & Authors -If you would like to see the detailed LICENSE click [here](license/). -Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graphs/contributors) for a list of authors and [maintainers](maintainers/) for the core team. +If you would like to see the detailed LICENSE click [here](license.md). +Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graphs/contributors) for a list of authors and [maintainers](contributing/maintainers.md) for the core team. ```text -# Copyright (c) 2020 IBM Corp. All rights reserved. +# Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -98,5 +103,17 @@ Consult [contributors](https://github.com/oscal-compass/compliance-trestle/graph # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - ``` + +______________________________________________________________________ + +We are a Cloud Native Computing Foundation sandbox project. + + + + + + +The Linux Foundation® (TLF) has registered trademarks and uses trademarks. For a list of TLF trademarks, see [Trademark Usage](https://www.linuxfoundation.org/legal/trademark-usage)". + +*Trestle was originally created by IBM.* diff --git a/docs/python_trestle_setup.md b/docs/installation.md similarity index 97% rename from docs/python_trestle_setup.md rename to docs/installation.md index c1853c7a1..45116ec9c 100644 --- a/docs/python_trestle_setup.md +++ b/docs/installation.md @@ -1,3 +1,8 @@ +--- +title: Installation +description: Instructions for installing compliance trestle with a python venv +--- + # Install trestle in a python virtual environment There are a few things you need to to start using trestle: diff --git a/docs/errors.md b/docs/known_limitations.md similarity index 70% rename from docs/errors.md rename to docs/known_limitations.md index 510451def..af85581ca 100644 --- a/docs/errors.md +++ b/docs/known_limitations.md @@ -1,3 +1,8 @@ +--- +title: Known Limitations +description: Known limitations of compliance trestle +--- + # Known errors and limitations ## utf-8 encoding only @@ -6,3 +11,7 @@ Trestle supports only utf8 as a file text-encoding. If non-utf8 files are encoun Trestle provides a [script](https://github.com/oscal-compass/compliance-trestle/blob/develop/scripts/utf8me.py) that may be used to convert files to utf8 in a destructive manner that may change the file contents. WARNING: This script is potentially destructive and may remove / damage content. Ensure you have a backup before use. + +## Single OSCAL release only + +Each version of compliance trestle is designed to support only one version of the OSCAL schema. diff --git a/docs/maintainers.md b/docs/maintainers.md deleted file mode 100644 index c279e3448..000000000 --- a/docs/maintainers.md +++ /dev/null @@ -1 +0,0 @@ -{!MAINTAINERS.md!} diff --git a/docs/mkdocs_code_of_conduct.md b/docs/mkdocs_code_of_conduct.md deleted file mode 100644 index d66c2b9b4..000000000 --- a/docs/mkdocs_code_of_conduct.md +++ /dev/null @@ -1,5 +0,0 @@ -# Code of Conduct - -The code of conduct now resides at the organization level in the community repository. Please visit https://github.com/oscal-compass/community/blob/main/CODE_OF_CONDUCT.md to review the common code of conduct. - -Note: The code of conduct is subject to change as `compliance-trestle` is on-boarded as a CNFC sandbox project. diff --git a/docs/plugins/compliance-trestle-fedramp.md b/docs/plugins/compliance-trestle-fedramp.md deleted file mode 100644 index 8b5069bb9..000000000 --- a/docs/plugins/compliance-trestle-fedramp.md +++ /dev/null @@ -1,14 +0,0 @@ -# compliance-trestle-fedramp plugin - -This plugin provides functionality for validating an SSP for FedRAMP compliance. It provides both an API interface and a trestle command for performing this validation. - -## `trestle fedramp-validate` - -This command allows users to validate existing OSCAL SSP file (in JSON or YAML format) for FedRAMP compliance. For example, `trestle fedramp-validate -f /local_dir/ssp.json -o report/` will validate `ssp.json` file for fedramp complaince and store the validation reports in `report` folder. - -The following options are supported: - -- `-f or --file`: specifies the path of an existing OSCAL SSP file. It may be an absolute or relative path. The file must be in either JSON or YAML format. This is a required option. -- `-o or --output`: specifies the name of the output directory where the validation reports will be stored. It may be an absolute or relative path. The output directory should already exist. This is also a required option. - -The validation reports are created in XML and HTML format and provide details on which part of the SSP are not complaint as per FedRAMP specification. diff --git a/docs/plugins/fedramp.md b/docs/plugins/fedramp.md new file mode 100644 index 000000000..e94444339 --- /dev/null +++ b/docs/plugins/fedramp.md @@ -0,0 +1,31 @@ +--- +title: FedRAMP plugin +description: Description of the compliance-trestle FedRAMP plugin for validating an SSP against the extended requirements for FedRAMP +--- + +# compliance-trestle-fedramp plugin + +This plugin provides functionality for validating an SSP for FedRAMP compliance. It provides both an API interface and a trestle command for performing this validation. + +## `trestle fedramp-validate` + +This command allows users to validate existing OSCAL SSP file (in JSON or YAML format) for FedRAMP compliance. For example, `trestle fedramp-validate -f /local_dir/ssp.json -o report/` will validate `ssp.json` file for fedramp compliance and store the validation reports in `report` folder. + +The following options are supported: + +- `-f or --file`: specifies the path of an existing OSCAL SSP file. It may be an absolute or relative path. The file must be in either JSON or YAML format. This is a required option. +- `-o or --output`: specifies the name of the output directory where the validation reports will be stored. It may be an absolute or relative path. The output directory should already exist. This is also a required option. + +The validation reports are created in XML and HTML format and provide details on which part of the SSP are not complaint as per FedRAMP specification. + +## `trestle fedramp-transform` + +This command allows users to extract information from an OSCAL SSP and transform it into a Word document based on the FedRAMP SSP Appendix A Template. The templates for the High, Moderate, and Low baseline security control requirements were retrieved from this [location](https://www.fedramp.gov/documents-templates/) and are bundled with the application. The `Control Summary Information` tables are populated for each control based on the OSCAL SSP. + +For example, `trestle fedramp-transform -n ssp-name -l 'high' -o my_ssp.docx` will transform the OSCAL SSP file `ssp-name` into a Word document `my_ssp.docx` based on the SSP Appendix A - High FedRAMP Security Controls template. + +The following options are supported: + +- `-n or --ssp-name`: The name of the OSCAL SSP imported into trestle workspace. This is a required option. +- `-l or --level`: The baseline level corresponding to the template. This is high, moderate, low. This is a required option. +- `-o or --output-file`: The output location for the populated Word document. This is also a required option. diff --git a/docs/reference/API/trestle/cli.md b/docs/reference/API/trestle/cli.md new file mode 100644 index 000000000..52f531c45 --- /dev/null +++ b/docs/reference/API/trestle/cli.md @@ -0,0 +1,7 @@ +--- +title: trestle.cli +description: Documentation for trestle.cli module +--- + +::: trestle.cli +handler: python diff --git a/docs/reference/API/trestle/common/common_types.md b/docs/reference/API/trestle/common/common_types.md new file mode 100644 index 000000000..a516d6ffc --- /dev/null +++ b/docs/reference/API/trestle/common/common_types.md @@ -0,0 +1,7 @@ +--- +title: trestle.common.common_types +description: Documentation for trestle.common.common_types module +--- + +::: trestle.common.common_types +handler: python diff --git a/docs/reference/API/trestle/common/const.md b/docs/reference/API/trestle/common/const.md new file mode 100644 index 000000000..7dcd34107 --- /dev/null +++ b/docs/reference/API/trestle/common/const.md @@ -0,0 +1,7 @@ +--- +title: trestle.common.const +description: Documentation for trestle.common.const module +--- + +::: trestle.common.const +handler: python diff --git a/docs/reference/API/trestle/common/err.md b/docs/reference/API/trestle/common/err.md new file mode 100644 index 000000000..712c641d2 --- /dev/null +++ b/docs/reference/API/trestle/common/err.md @@ -0,0 +1,7 @@ +--- +title: trestle.common.err +description: Documentation for trestle.common.err module +--- + +::: trestle.common.err +handler: python diff --git a/docs/reference/API/trestle/common/file_utils.md b/docs/reference/API/trestle/common/file_utils.md new file mode 100644 index 000000000..486307b96 --- /dev/null +++ b/docs/reference/API/trestle/common/file_utils.md @@ -0,0 +1,7 @@ +--- +title: trestle.common.file_utils +description: Documentation for trestle.common.file_utils module +--- + +::: trestle.common.file_utils +handler: python diff --git a/docs/reference/API/trestle/common/list_utils.md b/docs/reference/API/trestle/common/list_utils.md new file mode 100644 index 000000000..dae3c4d5b --- /dev/null +++ b/docs/reference/API/trestle/common/list_utils.md @@ -0,0 +1,7 @@ +--- +title: trestle.common.list_utils +description: Documentation for trestle.common.list_utils module +--- + +::: trestle.common.list_utils +handler: python diff --git a/docs/reference/API/trestle/common/load_validate.md b/docs/reference/API/trestle/common/load_validate.md new file mode 100644 index 000000000..5a6a1588f --- /dev/null +++ b/docs/reference/API/trestle/common/load_validate.md @@ -0,0 +1,7 @@ +--- +title: trestle.common.load_validate +description: Documentation for trestle.common.load_validate module +--- + +::: trestle.common.load_validate +handler: python diff --git a/docs/reference/API/trestle/common/log.md b/docs/reference/API/trestle/common/log.md new file mode 100644 index 000000000..98c64d1fa --- /dev/null +++ b/docs/reference/API/trestle/common/log.md @@ -0,0 +1,7 @@ +--- +title: trestle.common.log +description: Documentation for trestle.common.log module +--- + +::: trestle.common.log +handler: python diff --git a/docs/reference/API/trestle/common/model_utils.md b/docs/reference/API/trestle/common/model_utils.md new file mode 100644 index 000000000..f99ee651c --- /dev/null +++ b/docs/reference/API/trestle/common/model_utils.md @@ -0,0 +1,7 @@ +--- +title: trestle.common.model_utils +description: Documentation for trestle.common.model_utils module +--- + +::: trestle.common.model_utils +handler: python diff --git a/docs/reference/API/trestle/common/str_utils.md b/docs/reference/API/trestle/common/str_utils.md new file mode 100644 index 000000000..51171b122 --- /dev/null +++ b/docs/reference/API/trestle/common/str_utils.md @@ -0,0 +1,7 @@ +--- +title: trestle.common.str_utils +description: Documentation for trestle.common.str_utils module +--- + +::: trestle.common.str_utils +handler: python diff --git a/docs/reference/API/trestle/common/trash.md b/docs/reference/API/trestle/common/trash.md new file mode 100644 index 000000000..2755f5f12 --- /dev/null +++ b/docs/reference/API/trestle/common/trash.md @@ -0,0 +1,7 @@ +--- +title: trestle.common.trash +description: Documentation for trestle.common.trash module +--- + +::: trestle.common.trash +handler: python diff --git a/docs/reference/API/trestle/common/type_utils.md b/docs/reference/API/trestle/common/type_utils.md new file mode 100644 index 000000000..8d62d20b3 --- /dev/null +++ b/docs/reference/API/trestle/common/type_utils.md @@ -0,0 +1,7 @@ +--- +title: trestle.common.type_utils +description: Documentation for trestle.common.type_utils module +--- + +::: trestle.common.type_utils +handler: python diff --git a/docs/reference/API/trestle/core/all_validator.md b/docs/reference/API/trestle/core/all_validator.md new file mode 100644 index 000000000..b2d6026e1 --- /dev/null +++ b/docs/reference/API/trestle/core/all_validator.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.all_validator +description: Documentation for trestle.core.all_validator module +--- + +::: trestle.core.all_validator +handler: python diff --git a/docs/reference/API/trestle/core/base_model.md b/docs/reference/API/trestle/core/base_model.md new file mode 100644 index 000000000..c5edfe3c2 --- /dev/null +++ b/docs/reference/API/trestle/core/base_model.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.base_model +description: Documentation for trestle.core.base_model module +--- + +::: trestle.core.base_model +handler: python diff --git a/docs/reference/API/trestle/core/catalog/catalog_api.md b/docs/reference/API/trestle/core/catalog/catalog_api.md new file mode 100644 index 000000000..e3e592ba1 --- /dev/null +++ b/docs/reference/API/trestle/core/catalog/catalog_api.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.catalog.catalog_api +description: Documentation for trestle.core.catalog.catalog_api module +--- + +::: trestle.core.catalog.catalog_api +handler: python diff --git a/docs/reference/API/trestle/core/catalog/catalog_interface.md b/docs/reference/API/trestle/core/catalog/catalog_interface.md new file mode 100644 index 000000000..a9347c07b --- /dev/null +++ b/docs/reference/API/trestle/core/catalog/catalog_interface.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.catalog.catalog_interface +description: Documentation for trestle.core.catalog.catalog_interface module +--- + +::: trestle.core.catalog.catalog_interface +handler: python diff --git a/docs/reference/API/trestle/core/catalog/catalog_merger.md b/docs/reference/API/trestle/core/catalog/catalog_merger.md new file mode 100644 index 000000000..0620af375 --- /dev/null +++ b/docs/reference/API/trestle/core/catalog/catalog_merger.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.catalog.catalog_merger +description: Documentation for trestle.core.catalog.catalog_merger module +--- + +::: trestle.core.catalog.catalog_merger +handler: python diff --git a/docs/reference/API/trestle/core/catalog/catalog_reader.md b/docs/reference/API/trestle/core/catalog/catalog_reader.md new file mode 100644 index 000000000..f1751947c --- /dev/null +++ b/docs/reference/API/trestle/core/catalog/catalog_reader.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.catalog.catalog_reader +description: Documentation for trestle.core.catalog.catalog_reader module +--- + +::: trestle.core.catalog.catalog_reader +handler: python diff --git a/docs/reference/API/trestle/core/catalog/catalog_writer.md b/docs/reference/API/trestle/core/catalog/catalog_writer.md new file mode 100644 index 000000000..8e4ca1cbc --- /dev/null +++ b/docs/reference/API/trestle/core/catalog/catalog_writer.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.catalog.catalog_writer +description: Documentation for trestle.core.catalog.catalog_writer module +--- + +::: trestle.core.catalog.catalog_writer +handler: python diff --git a/docs/reference/API/trestle/core/catalog_validator.md b/docs/reference/API/trestle/core/catalog_validator.md new file mode 100644 index 000000000..c640d54ca --- /dev/null +++ b/docs/reference/API/trestle/core/catalog_validator.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.catalog_validator +description: Documentation for trestle.core.catalog_validator module +--- + +::: trestle.core.catalog_validator +handler: python diff --git a/docs/reference/API/trestle/core/commands/add.md b/docs/reference/API/trestle/core/commands/add.md new file mode 100644 index 000000000..268be418d --- /dev/null +++ b/docs/reference/API/trestle/core/commands/add.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.add +description: Documentation for trestle.core.commands.add module +--- + +::: trestle.core.commands.add +handler: python diff --git a/docs/reference/API/trestle/core/commands/assemble.md b/docs/reference/API/trestle/core/commands/assemble.md new file mode 100644 index 000000000..de74f904b --- /dev/null +++ b/docs/reference/API/trestle/core/commands/assemble.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.assemble +description: Documentation for trestle.core.commands.assemble module +--- + +::: trestle.core.commands.assemble +handler: python diff --git a/docs/reference/API/trestle/core/commands/author/catalog.md b/docs/reference/API/trestle/core/commands/author/catalog.md new file mode 100644 index 000000000..d9e7b577c --- /dev/null +++ b/docs/reference/API/trestle/core/commands/author/catalog.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.author.catalog +description: Documentation for trestle.core.commands.author.catalog module +--- + +::: trestle.core.commands.author.catalog +handler: python diff --git a/docs/reference/API/trestle/core/commands/author/command.md b/docs/reference/API/trestle/core/commands/author/command.md new file mode 100644 index 000000000..c3b12c357 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/author/command.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.author.command +description: Documentation for trestle.core.commands.author.command module +--- + +::: trestle.core.commands.author.command +handler: python diff --git a/docs/reference/API/trestle/core/commands/author/common.md b/docs/reference/API/trestle/core/commands/author/common.md new file mode 100644 index 000000000..64177b3fb --- /dev/null +++ b/docs/reference/API/trestle/core/commands/author/common.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.author.common +description: Documentation for trestle.core.commands.author.common module +--- + +::: trestle.core.commands.author.common +handler: python diff --git a/docs/reference/API/trestle/core/commands/author/component.md b/docs/reference/API/trestle/core/commands/author/component.md new file mode 100644 index 000000000..b86b01010 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/author/component.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.author.component +description: Documentation for trestle.core.commands.author.component module +--- + +::: trestle.core.commands.author.component +handler: python diff --git a/docs/reference/API/trestle/core/commands/author/consts.md b/docs/reference/API/trestle/core/commands/author/consts.md new file mode 100644 index 000000000..28b2b82f9 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/author/consts.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.author.consts +description: Documentation for trestle.core.commands.author.consts module +--- + +::: trestle.core.commands.author.consts +handler: python diff --git a/docs/reference/API/trestle/core/commands/author/docs.md b/docs/reference/API/trestle/core/commands/author/docs.md new file mode 100644 index 000000000..3d33d6b73 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/author/docs.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.author.docs +description: Documentation for trestle.core.commands.author.docs module +--- + +::: trestle.core.commands.author.docs +handler: python diff --git a/docs/reference/API/trestle/core/commands/author/folders.md b/docs/reference/API/trestle/core/commands/author/folders.md new file mode 100644 index 000000000..9b8f70251 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/author/folders.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.author.folders +description: Documentation for trestle.core.commands.author.folders module +--- + +::: trestle.core.commands.author.folders +handler: python diff --git a/docs/reference/API/trestle/core/commands/author/headers.md b/docs/reference/API/trestle/core/commands/author/headers.md new file mode 100644 index 000000000..f40580f15 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/author/headers.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.author.headers +description: Documentation for trestle.core.commands.author.headers module +--- + +::: trestle.core.commands.author.headers +handler: python diff --git a/docs/reference/API/trestle/core/commands/author/jinja.md b/docs/reference/API/trestle/core/commands/author/jinja.md new file mode 100644 index 000000000..1725a6f55 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/author/jinja.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.author.jinja +description: Documentation for trestle.core.commands.author.jinja module +--- + +::: trestle.core.commands.author.jinja +handler: python diff --git a/docs/reference/API/trestle/core/commands/author/prof.md b/docs/reference/API/trestle/core/commands/author/prof.md new file mode 100644 index 000000000..ed6f6772d --- /dev/null +++ b/docs/reference/API/trestle/core/commands/author/prof.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.author.prof +description: Documentation for trestle.core.commands.author.prof module +--- + +::: trestle.core.commands.author.prof +handler: python diff --git a/docs/reference/API/trestle/core/commands/author/ssp.md b/docs/reference/API/trestle/core/commands/author/ssp.md new file mode 100644 index 000000000..cc451d5f4 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/author/ssp.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.author.ssp +description: Documentation for trestle.core.commands.author.ssp module +--- + +::: trestle.core.commands.author.ssp +handler: python diff --git a/docs/reference/API/trestle/core/commands/author/versioning/template_versioning.md b/docs/reference/API/trestle/core/commands/author/versioning/template_versioning.md new file mode 100644 index 000000000..b3b8cbcd6 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/author/versioning/template_versioning.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.author.versioning.template_versioning +description: Documentation for trestle.core.commands.author.versioning.template_versioning module +--- + +::: trestle.core.commands.author.versioning.template_versioning +handler: python diff --git a/docs/reference/API/trestle/core/commands/command_docs.md b/docs/reference/API/trestle/core/commands/command_docs.md new file mode 100644 index 000000000..537672f05 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/command_docs.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.command_docs +description: Documentation for trestle.core.commands.command_docs module +--- + +::: trestle.core.commands.command_docs +handler: python diff --git a/docs/reference/API/trestle/core/commands/common/cmd_utils.md b/docs/reference/API/trestle/core/commands/common/cmd_utils.md new file mode 100644 index 000000000..ef0d318e3 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/common/cmd_utils.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.common.cmd_utils +description: Documentation for trestle.core.commands.common.cmd_utils module +--- + +::: trestle.core.commands.common.cmd_utils +handler: python diff --git a/docs/reference/API/trestle/core/commands/common/return_codes.md b/docs/reference/API/trestle/core/commands/common/return_codes.md new file mode 100644 index 000000000..8e4707f4f --- /dev/null +++ b/docs/reference/API/trestle/core/commands/common/return_codes.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.common.return_codes +description: Documentation for trestle.core.commands.common.return_codes module +--- + +::: trestle.core.commands.common.return_codes +handler: python diff --git a/docs/reference/API/trestle/core/commands/create.md b/docs/reference/API/trestle/core/commands/create.md new file mode 100644 index 000000000..72d65f5ea --- /dev/null +++ b/docs/reference/API/trestle/core/commands/create.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.create +description: Documentation for trestle.core.commands.create module +--- + +::: trestle.core.commands.create +handler: python diff --git a/docs/reference/API/trestle/core/commands/describe.md b/docs/reference/API/trestle/core/commands/describe.md new file mode 100644 index 000000000..44054c896 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/describe.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.describe +description: Documentation for trestle.core.commands.describe module +--- + +::: trestle.core.commands.describe +handler: python diff --git a/docs/reference/API/trestle/core/commands/href.md b/docs/reference/API/trestle/core/commands/href.md new file mode 100644 index 000000000..04a2c33bd --- /dev/null +++ b/docs/reference/API/trestle/core/commands/href.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.href +description: Documentation for trestle.core.commands.href module +--- + +::: trestle.core.commands.href +handler: python diff --git a/docs/reference/API/trestle/core/commands/import_.md b/docs/reference/API/trestle/core/commands/import_.md new file mode 100644 index 000000000..0b53255cb --- /dev/null +++ b/docs/reference/API/trestle/core/commands/import_.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.import_ +description: Documentation for trestle.core.commands.import_ module +--- + +::: trestle.core.commands.import_ +handler: python diff --git a/docs/reference/API/trestle/core/commands/init.md b/docs/reference/API/trestle/core/commands/init.md new file mode 100644 index 000000000..d726a6124 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/init.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.init +description: Documentation for trestle.core.commands.init module +--- + +::: trestle.core.commands.init +handler: python diff --git a/docs/reference/API/trestle/core/commands/merge.md b/docs/reference/API/trestle/core/commands/merge.md new file mode 100644 index 000000000..a1adfbb14 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/merge.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.merge +description: Documentation for trestle.core.commands.merge module +--- + +::: trestle.core.commands.merge +handler: python diff --git a/docs/reference/API/trestle/core/commands/partial_object_validate.md b/docs/reference/API/trestle/core/commands/partial_object_validate.md new file mode 100644 index 000000000..e34ace028 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/partial_object_validate.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.partial_object_validate +description: Documentation for trestle.core.commands.partial_object_validate module +--- + +::: trestle.core.commands.partial_object_validate +handler: python diff --git a/docs/reference/API/trestle/core/commands/remove.md b/docs/reference/API/trestle/core/commands/remove.md new file mode 100644 index 000000000..3a6c388e5 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/remove.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.remove +description: Documentation for trestle.core.commands.remove module +--- + +::: trestle.core.commands.remove +handler: python diff --git a/docs/reference/API/trestle/core/commands/replicate.md b/docs/reference/API/trestle/core/commands/replicate.md new file mode 100644 index 000000000..dbbab2097 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/replicate.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.replicate +description: Documentation for trestle.core.commands.replicate module +--- + +::: trestle.core.commands.replicate +handler: python diff --git a/docs/reference/API/trestle/core/commands/split.md b/docs/reference/API/trestle/core/commands/split.md new file mode 100644 index 000000000..bbae5e5f8 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/split.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.split +description: Documentation for trestle.core.commands.split module +--- + +::: trestle.core.commands.split +handler: python diff --git a/docs/reference/API/trestle/core/commands/task.md b/docs/reference/API/trestle/core/commands/task.md new file mode 100644 index 000000000..97291b9da --- /dev/null +++ b/docs/reference/API/trestle/core/commands/task.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.task +description: Documentation for trestle.core.commands.task module +--- + +::: trestle.core.commands.task +handler: python diff --git a/docs/reference/API/trestle/core/commands/validate.md b/docs/reference/API/trestle/core/commands/validate.md new file mode 100644 index 000000000..ee61a0556 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/validate.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.validate +description: Documentation for trestle.core.commands.validate module +--- + +::: trestle.core.commands.validate +handler: python diff --git a/docs/reference/API/trestle/core/commands/version.md b/docs/reference/API/trestle/core/commands/version.md new file mode 100644 index 000000000..dd186c010 --- /dev/null +++ b/docs/reference/API/trestle/core/commands/version.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.commands.version +description: Documentation for trestle.core.commands.version module +--- + +::: trestle.core.commands.version +handler: python diff --git a/docs/reference/API/trestle/core/control_context.md b/docs/reference/API/trestle/core/control_context.md new file mode 100644 index 000000000..b38b9e9b9 --- /dev/null +++ b/docs/reference/API/trestle/core/control_context.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.control_context +description: Documentation for trestle.core.control_context module +--- + +::: trestle.core.control_context +handler: python diff --git a/docs/reference/API/trestle/core/control_interface.md b/docs/reference/API/trestle/core/control_interface.md new file mode 100644 index 000000000..2a9bb6f00 --- /dev/null +++ b/docs/reference/API/trestle/core/control_interface.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.control_interface +description: Documentation for trestle.core.control_interface module +--- + +::: trestle.core.control_interface +handler: python diff --git a/docs/reference/API/trestle/core/control_reader.md b/docs/reference/API/trestle/core/control_reader.md new file mode 100644 index 000000000..52d3700d2 --- /dev/null +++ b/docs/reference/API/trestle/core/control_reader.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.control_reader +description: Documentation for trestle.core.control_reader module +--- + +::: trestle.core.control_reader +handler: python diff --git a/docs/reference/API/trestle/core/control_writer.md b/docs/reference/API/trestle/core/control_writer.md new file mode 100644 index 000000000..ba75ce4e3 --- /dev/null +++ b/docs/reference/API/trestle/core/control_writer.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.control_writer +description: Documentation for trestle.core.control_writer module +--- + +::: trestle.core.control_writer +handler: python diff --git a/docs/reference/API/trestle/core/crm/bycomp_interface.md b/docs/reference/API/trestle/core/crm/bycomp_interface.md new file mode 100644 index 000000000..399a75e24 --- /dev/null +++ b/docs/reference/API/trestle/core/crm/bycomp_interface.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.crm.bycomp_interface +description: Documentation for trestle.core.crm.bycomp_interface module +--- + +::: trestle.core.crm.bycomp_interface +handler: python diff --git a/docs/reference/API/trestle/core/crm/export_reader.md b/docs/reference/API/trestle/core/crm/export_reader.md new file mode 100644 index 000000000..dd6cf807f --- /dev/null +++ b/docs/reference/API/trestle/core/crm/export_reader.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.crm.export_reader +description: Documentation for trestle.core.crm.export_reader module +--- + +::: trestle.core.crm.export_reader +handler: python diff --git a/docs/reference/API/trestle/core/crm/export_writer.md b/docs/reference/API/trestle/core/crm/export_writer.md new file mode 100644 index 000000000..4a061b8f6 --- /dev/null +++ b/docs/reference/API/trestle/core/crm/export_writer.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.crm.export_writer +description: Documentation for trestle.core.crm.export_writer module +--- + +::: trestle.core.crm.export_writer +handler: python diff --git a/docs/reference/API/trestle/core/crm/leveraged_statements.md b/docs/reference/API/trestle/core/crm/leveraged_statements.md new file mode 100644 index 000000000..5f1f57a38 --- /dev/null +++ b/docs/reference/API/trestle/core/crm/leveraged_statements.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.crm.leveraged_statements +description: Documentation for trestle.core.crm.leveraged_statements module +--- + +::: trestle.core.crm.leveraged_statements +handler: python diff --git a/docs/reference/API/trestle/core/crm/ssp_inheritance_api.md b/docs/reference/API/trestle/core/crm/ssp_inheritance_api.md new file mode 100644 index 000000000..5af6cc354 --- /dev/null +++ b/docs/reference/API/trestle/core/crm/ssp_inheritance_api.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.crm.ssp_inheritance_api +description: Documentation for trestle.core.crm.ssp_inheritance_api module +--- + +::: trestle.core.crm.ssp_inheritance_api +handler: python diff --git a/docs/reference/API/trestle/core/docs_control_writer.md b/docs/reference/API/trestle/core/docs_control_writer.md new file mode 100644 index 000000000..80f05feac --- /dev/null +++ b/docs/reference/API/trestle/core/docs_control_writer.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.docs_control_writer +description: Documentation for trestle.core.docs_control_writer module +--- + +::: trestle.core.docs_control_writer +handler: python diff --git a/docs/reference/API/trestle/core/draw_io.md b/docs/reference/API/trestle/core/draw_io.md new file mode 100644 index 000000000..749fd2f9e --- /dev/null +++ b/docs/reference/API/trestle/core/draw_io.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.draw_io +description: Documentation for trestle.core.draw_io module +--- + +::: trestle.core.draw_io +handler: python diff --git a/docs/reference/API/trestle/core/duplicates_validator.md b/docs/reference/API/trestle/core/duplicates_validator.md new file mode 100644 index 000000000..44d022032 --- /dev/null +++ b/docs/reference/API/trestle/core/duplicates_validator.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.duplicates_validator +description: Documentation for trestle.core.duplicates_validator module +--- + +::: trestle.core.duplicates_validator +handler: python diff --git a/docs/reference/API/trestle/core/generators.md b/docs/reference/API/trestle/core/generators.md new file mode 100644 index 000000000..858606dfa --- /dev/null +++ b/docs/reference/API/trestle/core/generators.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.generators +description: Documentation for trestle.core.generators module +--- + +::: trestle.core.generators +handler: python diff --git a/docs/reference/API/trestle/core/generic_oscal.md b/docs/reference/API/trestle/core/generic_oscal.md new file mode 100644 index 000000000..d2e45d496 --- /dev/null +++ b/docs/reference/API/trestle/core/generic_oscal.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.generic_oscal +description: Documentation for trestle.core.generic_oscal module +--- + +::: trestle.core.generic_oscal +handler: python diff --git a/docs/reference/API/trestle/core/jinja/base.md b/docs/reference/API/trestle/core/jinja/base.md new file mode 100644 index 000000000..8cb5fbbc6 --- /dev/null +++ b/docs/reference/API/trestle/core/jinja/base.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.jinja.base +description: Documentation for trestle.core.jinja.base module +--- + +::: trestle.core.jinja.base +handler: python diff --git a/docs/reference/API/trestle/core/jinja/ext.md b/docs/reference/API/trestle/core/jinja/ext.md new file mode 100644 index 000000000..82bf4a689 --- /dev/null +++ b/docs/reference/API/trestle/core/jinja/ext.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.jinja.ext +description: Documentation for trestle.core.jinja.ext module +--- + +::: trestle.core.jinja.ext +handler: python diff --git a/docs/reference/API/trestle/core/jinja/filters.md b/docs/reference/API/trestle/core/jinja/filters.md new file mode 100644 index 000000000..0c80bd197 --- /dev/null +++ b/docs/reference/API/trestle/core/jinja/filters.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.jinja.filters +description: Documentation for trestle.core.jinja.filters module +--- + +::: trestle.core.jinja.filters +handler: python diff --git a/docs/reference/API/trestle/core/jinja/tags.md b/docs/reference/API/trestle/core/jinja/tags.md new file mode 100644 index 000000000..a3d7ca0df --- /dev/null +++ b/docs/reference/API/trestle/core/jinja/tags.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.jinja.tags +description: Documentation for trestle.core.jinja.tags module +--- + +::: trestle.core.jinja.tags +handler: python diff --git a/docs/reference/API/trestle/core/links_validator.md b/docs/reference/API/trestle/core/links_validator.md new file mode 100644 index 000000000..9ec13ac58 --- /dev/null +++ b/docs/reference/API/trestle/core/links_validator.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.links_validator +description: Documentation for trestle.core.links_validator module +--- + +::: trestle.core.links_validator +handler: python diff --git a/docs/reference/API/trestle/core/markdown/base_markdown_node.md b/docs/reference/API/trestle/core/markdown/base_markdown_node.md new file mode 100644 index 000000000..1f58a0b71 --- /dev/null +++ b/docs/reference/API/trestle/core/markdown/base_markdown_node.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.markdown.base_markdown_node +description: Documentation for trestle.core.markdown.base_markdown_node module +--- + +::: trestle.core.markdown.base_markdown_node +handler: python diff --git a/docs/reference/API/trestle/core/markdown/control_markdown_node.md b/docs/reference/API/trestle/core/markdown/control_markdown_node.md new file mode 100644 index 000000000..eeaf7c622 --- /dev/null +++ b/docs/reference/API/trestle/core/markdown/control_markdown_node.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.markdown.control_markdown_node +description: Documentation for trestle.core.markdown.control_markdown_node module +--- + +::: trestle.core.markdown.control_markdown_node +handler: python diff --git a/docs/reference/API/trestle/core/markdown/docs_markdown_node.md b/docs/reference/API/trestle/core/markdown/docs_markdown_node.md new file mode 100644 index 000000000..f1b0be681 --- /dev/null +++ b/docs/reference/API/trestle/core/markdown/docs_markdown_node.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.markdown.docs_markdown_node +description: Documentation for trestle.core.markdown.docs_markdown_node module +--- + +::: trestle.core.markdown.docs_markdown_node +handler: python diff --git a/docs/reference/API/trestle/core/markdown/markdown_api.md b/docs/reference/API/trestle/core/markdown/markdown_api.md new file mode 100644 index 000000000..c4ef59ecb --- /dev/null +++ b/docs/reference/API/trestle/core/markdown/markdown_api.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.markdown.markdown_api +description: Documentation for trestle.core.markdown.markdown_api module +--- + +::: trestle.core.markdown.markdown_api +handler: python diff --git a/docs/reference/API/trestle/core/markdown/markdown_const.md b/docs/reference/API/trestle/core/markdown/markdown_const.md new file mode 100644 index 000000000..d3b90f8a9 --- /dev/null +++ b/docs/reference/API/trestle/core/markdown/markdown_const.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.markdown.markdown_const +description: Documentation for trestle.core.markdown.markdown_const module +--- + +::: trestle.core.markdown.markdown_const +handler: python diff --git a/docs/reference/API/trestle/core/markdown/markdown_processor.md b/docs/reference/API/trestle/core/markdown/markdown_processor.md new file mode 100644 index 000000000..a6dfc0d17 --- /dev/null +++ b/docs/reference/API/trestle/core/markdown/markdown_processor.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.markdown.markdown_processor +description: Documentation for trestle.core.markdown.markdown_processor module +--- + +::: trestle.core.markdown.markdown_processor +handler: python diff --git a/docs/reference/API/trestle/core/markdown/markdown_validator.md b/docs/reference/API/trestle/core/markdown/markdown_validator.md new file mode 100644 index 000000000..4a0d61f7d --- /dev/null +++ b/docs/reference/API/trestle/core/markdown/markdown_validator.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.markdown.markdown_validator +description: Documentation for trestle.core.markdown.markdown_validator module +--- + +::: trestle.core.markdown.markdown_validator +handler: python diff --git a/docs/reference/API/trestle/core/markdown/md_writer.md b/docs/reference/API/trestle/core/markdown/md_writer.md new file mode 100644 index 000000000..04fa48286 --- /dev/null +++ b/docs/reference/API/trestle/core/markdown/md_writer.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.markdown.md_writer +description: Documentation for trestle.core.markdown.md_writer module +--- + +::: trestle.core.markdown.md_writer +handler: python diff --git a/docs/reference/API/trestle/core/models/actions.md b/docs/reference/API/trestle/core/models/actions.md new file mode 100644 index 000000000..9217933c9 --- /dev/null +++ b/docs/reference/API/trestle/core/models/actions.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.models.actions +description: Documentation for trestle.core.models.actions module +--- + +::: trestle.core.models.actions +handler: python diff --git a/docs/reference/API/trestle/core/models/elements.md b/docs/reference/API/trestle/core/models/elements.md new file mode 100644 index 000000000..ef313bb12 --- /dev/null +++ b/docs/reference/API/trestle/core/models/elements.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.models.elements +description: Documentation for trestle.core.models.elements module +--- + +::: trestle.core.models.elements +handler: python diff --git a/docs/reference/API/trestle/core/models/file_content_type.md b/docs/reference/API/trestle/core/models/file_content_type.md new file mode 100644 index 000000000..5224671ea --- /dev/null +++ b/docs/reference/API/trestle/core/models/file_content_type.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.models.file_content_type +description: Documentation for trestle.core.models.file_content_type module +--- + +::: trestle.core.models.file_content_type +handler: python diff --git a/docs/reference/API/trestle/core/models/interfaces.md b/docs/reference/API/trestle/core/models/interfaces.md new file mode 100644 index 000000000..b75612fa0 --- /dev/null +++ b/docs/reference/API/trestle/core/models/interfaces.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.models.interfaces +description: Documentation for trestle.core.models.interfaces module +--- + +::: trestle.core.models.interfaces +handler: python diff --git a/docs/reference/API/trestle/core/models/plans.md b/docs/reference/API/trestle/core/models/plans.md new file mode 100644 index 000000000..8e642b7f9 --- /dev/null +++ b/docs/reference/API/trestle/core/models/plans.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.models.plans +description: Documentation for trestle.core.models.plans module +--- + +::: trestle.core.models.plans +handler: python diff --git a/docs/reference/API/trestle/core/object_factory.md b/docs/reference/API/trestle/core/object_factory.md new file mode 100644 index 000000000..b6cc6e2d1 --- /dev/null +++ b/docs/reference/API/trestle/core/object_factory.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.object_factory +description: Documentation for trestle.core.object_factory module +--- + +::: trestle.core.object_factory +handler: python diff --git a/docs/reference/API/trestle/core/parser.md b/docs/reference/API/trestle/core/parser.md new file mode 100644 index 000000000..ee3edbacd --- /dev/null +++ b/docs/reference/API/trestle/core/parser.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.parser +description: Documentation for trestle.core.parser module +--- + +::: trestle.core.parser +handler: python diff --git a/docs/reference/API/trestle/core/pipeline.md b/docs/reference/API/trestle/core/pipeline.md new file mode 100644 index 000000000..e927a3092 --- /dev/null +++ b/docs/reference/API/trestle/core/pipeline.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.pipeline +description: Documentation for trestle.core.pipeline module +--- + +::: trestle.core.pipeline +handler: python diff --git a/docs/reference/API/trestle/core/plugins.md b/docs/reference/API/trestle/core/plugins.md new file mode 100644 index 000000000..83e8d87c3 --- /dev/null +++ b/docs/reference/API/trestle/core/plugins.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.plugins +description: Documentation for trestle.core.plugins module +--- + +::: trestle.core.plugins +handler: python diff --git a/docs/reference/API/trestle/core/profile_resolver.md b/docs/reference/API/trestle/core/profile_resolver.md new file mode 100644 index 000000000..ed1433861 --- /dev/null +++ b/docs/reference/API/trestle/core/profile_resolver.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.profile_resolver +description: Documentation for trestle.core.profile_resolver module +--- + +::: trestle.core.profile_resolver +handler: python diff --git a/docs/reference/API/trestle/core/refs_validator.md b/docs/reference/API/trestle/core/refs_validator.md new file mode 100644 index 000000000..b33b24e2f --- /dev/null +++ b/docs/reference/API/trestle/core/refs_validator.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.refs_validator +description: Documentation for trestle.core.refs_validator module +--- + +::: trestle.core.refs_validator +handler: python diff --git a/docs/reference/API/trestle/core/remote/cache.md b/docs/reference/API/trestle/core/remote/cache.md new file mode 100644 index 000000000..6448e33f3 --- /dev/null +++ b/docs/reference/API/trestle/core/remote/cache.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.remote.cache +description: Documentation for trestle.core.remote.cache module +--- + +::: trestle.core.remote.cache +handler: python diff --git a/docs/reference/API/trestle/core/repository.md b/docs/reference/API/trestle/core/repository.md new file mode 100644 index 000000000..3ae3c0864 --- /dev/null +++ b/docs/reference/API/trestle/core/repository.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.repository +description: Documentation for trestle.core.repository module +--- + +::: trestle.core.repository +handler: python diff --git a/docs/reference/API/trestle/core/resolver/merge.md b/docs/reference/API/trestle/core/resolver/merge.md new file mode 100644 index 000000000..634b5bb22 --- /dev/null +++ b/docs/reference/API/trestle/core/resolver/merge.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.resolver.merge +description: Documentation for trestle.core.resolver.merge module +--- + +::: trestle.core.resolver.merge +handler: python diff --git a/docs/reference/API/trestle/core/resolver/modify.md b/docs/reference/API/trestle/core/resolver/modify.md new file mode 100644 index 000000000..912888772 --- /dev/null +++ b/docs/reference/API/trestle/core/resolver/modify.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.resolver.modify +description: Documentation for trestle.core.resolver.modify module +--- + +::: trestle.core.resolver.modify +handler: python diff --git a/docs/reference/API/trestle/core/resolver/prune.md b/docs/reference/API/trestle/core/resolver/prune.md new file mode 100644 index 000000000..01280d6ea --- /dev/null +++ b/docs/reference/API/trestle/core/resolver/prune.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.resolver.prune +description: Documentation for trestle.core.resolver.prune module +--- + +::: trestle.core.resolver.prune +handler: python diff --git a/docs/reference/API/trestle/core/rule_parameters_validator.md b/docs/reference/API/trestle/core/rule_parameters_validator.md new file mode 100644 index 000000000..a27ea98d7 --- /dev/null +++ b/docs/reference/API/trestle/core/rule_parameters_validator.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.rule_parameters_validator +description: Documentation for trestle.core.rule_parameters_validator module +--- + +::: trestle.core.rule_parameters_validator +handler: python diff --git a/docs/reference/API/trestle/core/ssp_io.md b/docs/reference/API/trestle/core/ssp_io.md new file mode 100644 index 000000000..3670e2e3a --- /dev/null +++ b/docs/reference/API/trestle/core/ssp_io.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.ssp_io +description: Documentation for trestle.core.ssp_io module +--- + +::: trestle.core.ssp_io +handler: python diff --git a/docs/reference/API/trestle/core/trestle_base_model.md b/docs/reference/API/trestle/core/trestle_base_model.md new file mode 100644 index 000000000..a9e985612 --- /dev/null +++ b/docs/reference/API/trestle/core/trestle_base_model.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.trestle_base_model +description: Documentation for trestle.core.trestle_base_model module +--- + +::: trestle.core.trestle_base_model +handler: python diff --git a/docs/reference/API/trestle/core/validator.md b/docs/reference/API/trestle/core/validator.md new file mode 100644 index 000000000..9f20deebe --- /dev/null +++ b/docs/reference/API/trestle/core/validator.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.validator +description: Documentation for trestle.core.validator module +--- + +::: trestle.core.validator +handler: python diff --git a/docs/reference/API/trestle/core/validator_factory.md b/docs/reference/API/trestle/core/validator_factory.md new file mode 100644 index 000000000..72ce90658 --- /dev/null +++ b/docs/reference/API/trestle/core/validator_factory.md @@ -0,0 +1,7 @@ +--- +title: trestle.core.validator_factory +description: Documentation for trestle.core.validator_factory module +--- + +::: trestle.core.validator_factory +handler: python diff --git a/docs/reference/API/trestle/oscal/assessment_plan.md b/docs/reference/API/trestle/oscal/assessment_plan.md new file mode 100644 index 000000000..a22aa3f0c --- /dev/null +++ b/docs/reference/API/trestle/oscal/assessment_plan.md @@ -0,0 +1,7 @@ +--- +title: trestle.oscal.assessment_plan +description: Documentation for trestle.oscal.assessment_plan module +--- + +::: trestle.oscal.assessment_plan +handler: python diff --git a/docs/reference/API/trestle/oscal/assessment_results.md b/docs/reference/API/trestle/oscal/assessment_results.md new file mode 100644 index 000000000..a90b6a95d --- /dev/null +++ b/docs/reference/API/trestle/oscal/assessment_results.md @@ -0,0 +1,7 @@ +--- +title: trestle.oscal.assessment_results +description: Documentation for trestle.oscal.assessment_results module +--- + +::: trestle.oscal.assessment_results +handler: python diff --git a/docs/reference/API/trestle/oscal/catalog.md b/docs/reference/API/trestle/oscal/catalog.md new file mode 100644 index 000000000..663ce269b --- /dev/null +++ b/docs/reference/API/trestle/oscal/catalog.md @@ -0,0 +1,7 @@ +--- +title: trestle.oscal.catalog +description: Documentation for trestle.oscal.catalog module +--- + +::: trestle.oscal.catalog +handler: python diff --git a/docs/reference/API/trestle/oscal/common.md b/docs/reference/API/trestle/oscal/common.md new file mode 100644 index 000000000..4ea6093bd --- /dev/null +++ b/docs/reference/API/trestle/oscal/common.md @@ -0,0 +1,7 @@ +--- +title: trestle.oscal.common +description: Documentation for trestle.oscal.common module +--- + +::: trestle.oscal.common +handler: python diff --git a/docs/reference/API/trestle/oscal/component.md b/docs/reference/API/trestle/oscal/component.md new file mode 100644 index 000000000..f07d571a8 --- /dev/null +++ b/docs/reference/API/trestle/oscal/component.md @@ -0,0 +1,7 @@ +--- +title: trestle.oscal.component +description: Documentation for trestle.oscal.component module +--- + +::: trestle.oscal.component +handler: python diff --git a/docs/reference/API/trestle/oscal/poam.md b/docs/reference/API/trestle/oscal/poam.md new file mode 100644 index 000000000..385c3e7d0 --- /dev/null +++ b/docs/reference/API/trestle/oscal/poam.md @@ -0,0 +1,7 @@ +--- +title: trestle.oscal.poam +description: Documentation for trestle.oscal.poam module +--- + +::: trestle.oscal.poam +handler: python diff --git a/docs/reference/API/trestle/oscal/profile.md b/docs/reference/API/trestle/oscal/profile.md new file mode 100644 index 000000000..22e07a01f --- /dev/null +++ b/docs/reference/API/trestle/oscal/profile.md @@ -0,0 +1,7 @@ +--- +title: trestle.oscal.profile +description: Documentation for trestle.oscal.profile module +--- + +::: trestle.oscal.profile +handler: python diff --git a/docs/reference/API/trestle/oscal/ssp.md b/docs/reference/API/trestle/oscal/ssp.md new file mode 100644 index 000000000..f0d3eebcb --- /dev/null +++ b/docs/reference/API/trestle/oscal/ssp.md @@ -0,0 +1,7 @@ +--- +title: trestle.oscal.ssp +description: Documentation for trestle.oscal.ssp module +--- + +::: trestle.oscal.ssp +handler: python diff --git a/docs/reference/API/trestle/tasks/base_task.md b/docs/reference/API/trestle/tasks/base_task.md new file mode 100644 index 000000000..4dfde48b5 --- /dev/null +++ b/docs/reference/API/trestle/tasks/base_task.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.base_task +description: Documentation for trestle.tasks.base_task module +--- + +::: trestle.tasks.base_task +handler: python diff --git a/docs/reference/API/trestle/tasks/cis_xlsx_to_oscal_catalog.md b/docs/reference/API/trestle/tasks/cis_xlsx_to_oscal_catalog.md new file mode 100644 index 000000000..0d432b2f9 --- /dev/null +++ b/docs/reference/API/trestle/tasks/cis_xlsx_to_oscal_catalog.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.cis_xlsx_to_oscal_catalog +description: Documentation for trestle.tasks.cis_xlsx_to_oscal_catalog module +--- + +::: trestle.tasks.cis_xlsx_to_oscal_catalog +handler: python diff --git a/docs/reference/API/trestle/tasks/csv_to_oscal_cd.md b/docs/reference/API/trestle/tasks/csv_to_oscal_cd.md new file mode 100644 index 000000000..9c8b3ee56 --- /dev/null +++ b/docs/reference/API/trestle/tasks/csv_to_oscal_cd.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.csv_to_oscal_cd +description: Documentation for trestle.tasks.csv_to_oscal_cd module +--- + +::: trestle.tasks.csv_to_oscal_cd +handler: python diff --git a/docs/reference/API/trestle/tasks/ocp4_cis_profile_to_oscal_catalog.md b/docs/reference/API/trestle/tasks/ocp4_cis_profile_to_oscal_catalog.md new file mode 100644 index 000000000..da53a4c93 --- /dev/null +++ b/docs/reference/API/trestle/tasks/ocp4_cis_profile_to_oscal_catalog.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.ocp4_cis_profile_to_oscal_catalog +description: Documentation for trestle.tasks.ocp4_cis_profile_to_oscal_catalog module +--- + +::: trestle.tasks.ocp4_cis_profile_to_oscal_catalog +handler: python diff --git a/docs/reference/API/trestle/tasks/ocp4_cis_profile_to_oscal_cd.md b/docs/reference/API/trestle/tasks/ocp4_cis_profile_to_oscal_cd.md new file mode 100644 index 000000000..75cbee5f7 --- /dev/null +++ b/docs/reference/API/trestle/tasks/ocp4_cis_profile_to_oscal_cd.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.ocp4_cis_profile_to_oscal_cd +description: Documentation for trestle.tasks.ocp4_cis_profile_to_oscal_cd module +--- + +::: trestle.tasks.ocp4_cis_profile_to_oscal_cd +handler: python diff --git a/docs/reference/API/trestle/tasks/oscal_catalog_to_csv.md b/docs/reference/API/trestle/tasks/oscal_catalog_to_csv.md new file mode 100644 index 000000000..e055609d3 --- /dev/null +++ b/docs/reference/API/trestle/tasks/oscal_catalog_to_csv.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.oscal_catalog_to_csv +description: Documentation for trestle.tasks.oscal_catalog_to_csv module +--- + +::: trestle.tasks.oscal_catalog_to_csv +handler: python diff --git a/docs/reference/API/trestle/tasks/oscal_profile_to_osco_profile.md b/docs/reference/API/trestle/tasks/oscal_profile_to_osco_profile.md new file mode 100644 index 000000000..0f4c529e4 --- /dev/null +++ b/docs/reference/API/trestle/tasks/oscal_profile_to_osco_profile.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.oscal_profile_to_osco_profile +description: Documentation for trestle.tasks.oscal_profile_to_osco_profile module +--- + +::: trestle.tasks.oscal_profile_to_osco_profile +handler: python diff --git a/docs/reference/API/trestle/tasks/osco_result_to_oscal_ar.md b/docs/reference/API/trestle/tasks/osco_result_to_oscal_ar.md new file mode 100644 index 000000000..355d80dde --- /dev/null +++ b/docs/reference/API/trestle/tasks/osco_result_to_oscal_ar.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.osco_result_to_oscal_ar +description: Documentation for trestle.tasks.osco_result_to_oscal_ar module +--- + +::: trestle.tasks.osco_result_to_oscal_ar +handler: python diff --git a/docs/reference/API/trestle/tasks/tanium_result_to_oscal_ar.md b/docs/reference/API/trestle/tasks/tanium_result_to_oscal_ar.md new file mode 100644 index 000000000..d15e63ac2 --- /dev/null +++ b/docs/reference/API/trestle/tasks/tanium_result_to_oscal_ar.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.tanium_result_to_oscal_ar +description: Documentation for trestle.tasks.tanium_result_to_oscal_ar module +--- + +::: trestle.tasks.tanium_result_to_oscal_ar +handler: python diff --git a/docs/reference/API/trestle/tasks/transform.md b/docs/reference/API/trestle/tasks/transform.md new file mode 100644 index 000000000..4e0a0576b --- /dev/null +++ b/docs/reference/API/trestle/tasks/transform.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.transform +description: Documentation for trestle.tasks.transform module +--- + +::: trestle.tasks.transform +handler: python diff --git a/docs/reference/API/trestle/tasks/xccdf_result_to_oscal_ar.md b/docs/reference/API/trestle/tasks/xccdf_result_to_oscal_ar.md new file mode 100644 index 000000000..7bf1edf6f --- /dev/null +++ b/docs/reference/API/trestle/tasks/xccdf_result_to_oscal_ar.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.xccdf_result_to_oscal_ar +description: Documentation for trestle.tasks.xccdf_result_to_oscal_ar module +--- + +::: trestle.tasks.xccdf_result_to_oscal_ar +handler: python diff --git a/docs/reference/API/trestle/tasks/xlsx_helper.md b/docs/reference/API/trestle/tasks/xlsx_helper.md new file mode 100644 index 000000000..94bdff7b2 --- /dev/null +++ b/docs/reference/API/trestle/tasks/xlsx_helper.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.xlsx_helper +description: Documentation for trestle.tasks.xlsx_helper module +--- + +::: trestle.tasks.xlsx_helper +handler: python diff --git a/docs/reference/API/trestle/tasks/xlsx_to_oscal_cd.md b/docs/reference/API/trestle/tasks/xlsx_to_oscal_cd.md new file mode 100644 index 000000000..10ac4202d --- /dev/null +++ b/docs/reference/API/trestle/tasks/xlsx_to_oscal_cd.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.xlsx_to_oscal_cd +description: Documentation for trestle.tasks.xlsx_to_oscal_cd module +--- + +::: trestle.tasks.xlsx_to_oscal_cd +handler: python diff --git a/docs/reference/API/trestle/tasks/xlsx_to_oscal_profile.md b/docs/reference/API/trestle/tasks/xlsx_to_oscal_profile.md new file mode 100644 index 000000000..4302b2ff5 --- /dev/null +++ b/docs/reference/API/trestle/tasks/xlsx_to_oscal_profile.md @@ -0,0 +1,7 @@ +--- +title: trestle.tasks.xlsx_to_oscal_profile +description: Documentation for trestle.tasks.xlsx_to_oscal_profile module +--- + +::: trestle.tasks.xlsx_to_oscal_profile +handler: python diff --git a/docs/reference/API/trestle/transforms/implementations/osco.md b/docs/reference/API/trestle/transforms/implementations/osco.md new file mode 100644 index 000000000..8406ece5d --- /dev/null +++ b/docs/reference/API/trestle/transforms/implementations/osco.md @@ -0,0 +1,7 @@ +--- +title: trestle.transforms.implementations.osco +description: Documentation for trestle.transforms.implementations.osco module +--- + +::: trestle.transforms.implementations.osco +handler: python diff --git a/docs/reference/API/trestle/transforms/implementations/tanium.md b/docs/reference/API/trestle/transforms/implementations/tanium.md new file mode 100644 index 000000000..1d57cf2da --- /dev/null +++ b/docs/reference/API/trestle/transforms/implementations/tanium.md @@ -0,0 +1,7 @@ +--- +title: trestle.transforms.implementations.tanium +description: Documentation for trestle.transforms.implementations.tanium module +--- + +::: trestle.transforms.implementations.tanium +handler: python diff --git a/docs/reference/API/trestle/transforms/implementations/xccdf.md b/docs/reference/API/trestle/transforms/implementations/xccdf.md new file mode 100644 index 000000000..5b44401d5 --- /dev/null +++ b/docs/reference/API/trestle/transforms/implementations/xccdf.md @@ -0,0 +1,7 @@ +--- +title: trestle.transforms.implementations.xccdf +description: Documentation for trestle.transforms.implementations.xccdf module +--- + +::: trestle.transforms.implementations.xccdf +handler: python diff --git a/docs/reference/API/trestle/transforms/results.md b/docs/reference/API/trestle/transforms/results.md new file mode 100644 index 000000000..44bdf4e19 --- /dev/null +++ b/docs/reference/API/trestle/transforms/results.md @@ -0,0 +1,7 @@ +--- +title: trestle.transforms.results +description: Documentation for trestle.transforms.results module +--- + +::: trestle.transforms.results +handler: python diff --git a/docs/reference/API/trestle/transforms/transformer_factory.md b/docs/reference/API/trestle/transforms/transformer_factory.md new file mode 100644 index 000000000..dce05f599 --- /dev/null +++ b/docs/reference/API/trestle/transforms/transformer_factory.md @@ -0,0 +1,7 @@ +--- +title: trestle.transforms.transformer_factory +description: Documentation for trestle.transforms.transformer_factory module +--- + +::: trestle.transforms.transformer_factory +handler: python diff --git a/docs/reference/API/trestle/transforms/transformer_helper.md b/docs/reference/API/trestle/transforms/transformer_helper.md new file mode 100644 index 000000000..6d2565feb --- /dev/null +++ b/docs/reference/API/trestle/transforms/transformer_helper.md @@ -0,0 +1,7 @@ +--- +title: trestle.transforms.transformer_helper +description: Documentation for trestle.transforms.transformer_helper module +--- + +::: trestle.transforms.transformer_helper +handler: python diff --git a/docs/reference/API/trestle/transforms/transformer_singleton.md b/docs/reference/API/trestle/transforms/transformer_singleton.md new file mode 100644 index 000000000..f06c63a0c --- /dev/null +++ b/docs/reference/API/trestle/transforms/transformer_singleton.md @@ -0,0 +1,7 @@ +--- +title: trestle.transforms.transformer_singleton +description: Documentation for trestle.transforms.transformer_singleton module +--- + +::: trestle.transforms.transformer_singleton +handler: python diff --git a/docs/reference/third-party-result-schema-SCC.md b/docs/reference/third-party-result-schema-IBM-SCC.md similarity index 98% rename from docs/reference/third-party-result-schema-SCC.md rename to docs/reference/third-party-result-schema-IBM-SCC.md index 57dddbaac..5224103f4 100644 --- a/docs/reference/third-party-result-schema-SCC.md +++ b/docs/reference/third-party-result-schema-IBM-SCC.md @@ -1,3 +1,8 @@ +--- +title: IBM SCC assessment results integration +description: Description of how to use trestle to interchange results with IBM Cloud Security and Compliance Center +--- + # Schema of Assessment Results for Interchange with IBM Cloud Security and Compliance Center, SCC This document depicts the structure and guidelines for creating an OSCAL result object which would be generated by various transformers for different tools such as Tanium to OSCAL and OSCO to OSCAL. Policy Validation Points (PVPs) such as toolchain that directly generate OSCAL results for sending to SCC Exchange API should follow the structure and guidelines described below. diff --git a/docs/tutorials/task.ocp4-cis-profile-to-oscal-catalog/transformation.md b/docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_catalog.md similarity index 98% rename from docs/tutorials/task.ocp4-cis-profile-to-oscal-catalog/transformation.md rename to docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_catalog.md index 5b36df015..13852b49b 100644 --- a/docs/tutorials/task.ocp4-cis-profile-to-oscal-catalog/transformation.md +++ b/docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_catalog.md @@ -1,8 +1,13 @@ +--- +title: ComplianceAsCode profiles to OSCAL catalog +description: Converting compliance as code profiles into an OSCAL catalog with compliance-trestle +--- + # Tutorial: Setup for and use of ComplianceAsCode profile to OSCAL Catalog transformer -Here are step by step instructions for setup and transformation of [ComplianceAsCode](https://github.com/ComplianceAsCode/content) profile data files into [NIST](https://www.nist.gov/) standard [OSCAL](https://pages.nist.gov/OSCAL/) [Catalog](https://pages.nist.gov/OSCAL/reference/latest/catalog/json-outline/) using the [compliance-trestle](https://oscal-compass.github.io/compliance-trestle/) tool. +Here are step by step instructions for setup and transformation of [ComplianceAsCode](https://github.com/ComplianceAsCode/content) profile data files into [NIST](https://www.nist.gov/) standard [OSCAL](https://pages.nist.gov/OSCAL/) [Catalog](https://pages.nist.gov/OSCAL-Reference/models/latest/catalog/json-outline/) using the [compliance-trestle](../../index.md) tool. -## *Objective* +## Objective How to transform one or more `.profile` compliance files into a standardized `OSCAL.json` file. @@ -10,11 +15,11 @@ There are 2 short steps shown below. The first is a one-time check/set-up of your environment. The second is a one-command transformation from `.profile` to `OSCAL.json`. -## *Step 1: Install trestle in a Python virtual environment* +## Step 1: Install trestle in a Python virtual environment -Follow the instructions [here](https://oscal-compass.github.io/compliance-trestle/python_trestle_setup/) to install trestle in a virtual environment. +Follow the instructions [here](../../installation.md) to install trestle in a virtual environment. -## *Step 2: Transform profile data (CIS benchmarks)* +## Step 2: Transform profile data (CIS benchmarks) Linux, Mac diff --git a/docs/tutorials/task.ocp4-cis-profile-to-oscal-catalog/demo-ocp4-cis-profile-to-oscal-catalog.config b/docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_catalog/demo-ocp4-cis-profile-to-oscal-catalog.config similarity index 100% rename from docs/tutorials/task.ocp4-cis-profile-to-oscal-catalog/demo-ocp4-cis-profile-to-oscal-catalog.config rename to docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_catalog/demo-ocp4-cis-profile-to-oscal-catalog.config diff --git a/docs/tutorials/task.ocp4-cis-profile-to-oscal-cd/transformation.md b/docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_cd.md similarity index 97% rename from docs/tutorials/task.ocp4-cis-profile-to-oscal-cd/transformation.md rename to docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_cd.md index 23184aea1..119647497 100644 --- a/docs/tutorials/task.ocp4-cis-profile-to-oscal-cd/transformation.md +++ b/docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_cd.md @@ -1,8 +1,13 @@ +--- +title: Converting ComplianceAsCode profiles to component definitions +description: Tutorial on converting ComplianceAsCode profiles to OSCAL component definitions +--- + # Tutorial: Setup for and use of ComplianceAsCode profile to OSCAL Component Definition transformer -Here are step by step instructions for setup and transformation of [ComplianceAsCode](https://github.com/ComplianceAsCode/content) profile data files into [NIST](https://www.nist.gov/) standard [OSCAL](https://pages.nist.gov/OSCAL/) [Component Definition](https://pages.nist.gov/OSCAL/reference/latest/component-definition/json-outline/) using the [compliance-trestle](https://oscal-compass.github.io/compliance-trestle/) tool. +Here are step by step instructions for setup and transformation of [ComplianceAsCode](https://github.com/ComplianceAsCode/content) profile data files into [NIST](https://www.nist.gov/) standard [OSCAL](https://pages.nist.gov/OSCAL/) [Component Definition](https://pages.nist.gov/OSCAL-Reference/models/v1.1.2/complete/json-reference/#/component-definition) using the [compliance-trestle](https://oscal-compass.github.io/compliance-trestle/) tool. -## *Objective* +## Objective How to transform one or more `.profile` compliance files into a standardized `OSCAL.json` file. @@ -10,11 +15,11 @@ There are 2 short steps shown below. The first is a one-time check/set-up of your environment. The second is a one-command transformation from `.profile` to `OSCAL.json`. -## *Step 1: Install trestle in a Python virtual environment* +## Step 1: Install trestle in a Python virtual environment Follow the instructions [here](https://oscal-compass.github.io/compliance-trestle/python_trestle_setup/) to install trestle in a virtual environment. -## *Step 2: Transform profile data (CIS benchmarks)* +## Step 2: Transform profile data (CIS benchmarks) Linux, Mac diff --git a/docs/tutorials/task.ocp4-cis-profile-to-oscal-cd/demo-ocp4-cis-profile-to-oscal-cd.config b/docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_cd/demo-ocp4-cis-profile-to-oscal-cd.config similarity index 100% rename from docs/tutorials/task.ocp4-cis-profile-to-oscal-cd/demo-ocp4-cis-profile-to-oscal-cd.config rename to docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_cd/demo-ocp4-cis-profile-to-oscal-cd.config diff --git a/docs/tutorials/task.ocp4-cis-profile-to-oscal-cd/enabled_rules.json b/docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_cd/enabled_rules.json similarity index 100% rename from docs/tutorials/task.ocp4-cis-profile-to-oscal-cd/enabled_rules.json rename to docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_cd/enabled_rules.json diff --git a/docs/tutorials/task.ocp4-cis-profile-to-oscal-cd/selected_rules.json b/docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_cd/selected_rules.json similarity index 100% rename from docs/tutorials/task.ocp4-cis-profile-to-oscal-cd/selected_rules.json rename to docs/tutorials/Transformers_and_Tasks/OCP4_CIS_profile_to_oscal_cd/selected_rules.json diff --git a/docs/tutorials/task.tanium-result-to-oscal-ar/transformation.md b/docs/tutorials/Transformers_and_Tasks/Tanium_result_to_oscal_ar.md similarity index 98% rename from docs/tutorials/task.tanium-result-to-oscal-ar/transformation.md rename to docs/tutorials/Transformers_and_Tasks/Tanium_result_to_oscal_ar.md index 844984619..2497bcab4 100644 --- a/docs/tutorials/task.tanium-result-to-oscal-ar/transformation.md +++ b/docs/tutorials/Transformers_and_Tasks/Tanium_result_to_oscal_ar.md @@ -1,8 +1,13 @@ +--- +title: Coverting Tanium results to OSCAL +description: Tutorial on how to use compliance trestle to convert Tanium results output to OSCAL assessment results +--- + # Tutorial: Setup for and use of Tanium to OSCAL transformer Here are step by step instructions for setup and transformation of [Tanium](https://www.tanium.com/) compliance data files into [NIST](https://www.nist.gov/) standard [OSCAL](https://pages.nist.gov/OSCAL/) using the [compliance-trestle](https://oscal-compass.github.io/compliance-trestle/) tool. -## *Objective* +## Objective How to transform a `Tanium.results` compliance file into a standardized `OSCAL.json` file. @@ -10,7 +15,7 @@ There are 2 short steps shown below. The first is a one-time check/set-up of your environment. The second is a one-command transformation from `Tanium.results` to `OSCAL.json`. -## *Step 1: Environment setup* +## Step 1: Environment setup Linux, Mac @@ -28,7 +33,7 @@ Make these changes: -- Insure you have a modern [Python](https://www.python.org/downloads/) (3.7, 3.8, 3.9). +- Insure you have a modern [Python](https://www.python.org/downloads/) (3.9, 3.10, 3.11). ```bash $ python -V @@ -77,7 +82,7 @@ usage: trestle [-h] {init,create,split,merge,replicate,add,remove,validate,impor Initialized trestle project successfully in /home//trestle.workspace ``` -## *Step 2: Transform sample* +## Step 2: Transform sample - Create Tanium data folders. @@ -900,4 +905,4 @@ Congratulations! You have bridged Tanium data into an OSCAL Assessment Results u Newtown, Victoria -![Australia Scarsdale Nimons Bridge](800px-Australia_scarsdale_nimons_bridge.jpg) +![Australia Scarsdale Nimons Bridge](Tanium_result_to_oscal_ar/800px-Australia_scarsdale_nimons_bridge.jpg) diff --git a/docs/tutorials/task.tanium-result-to-oscal-ar/800px-Australia_scarsdale_nimons_bridge.copyright-info.txt b/docs/tutorials/Transformers_and_Tasks/Tanium_result_to_oscal_ar/800px-Australia_scarsdale_nimons_bridge.copyright-info.txt similarity index 100% rename from docs/tutorials/task.tanium-result-to-oscal-ar/800px-Australia_scarsdale_nimons_bridge.copyright-info.txt rename to docs/tutorials/Transformers_and_Tasks/Tanium_result_to_oscal_ar/800px-Australia_scarsdale_nimons_bridge.copyright-info.txt diff --git a/docs/tutorials/task.tanium-result-to-oscal-ar/800px-Australia_scarsdale_nimons_bridge.jpg b/docs/tutorials/Transformers_and_Tasks/Tanium_result_to_oscal_ar/800px-Australia_scarsdale_nimons_bridge.jpg similarity index 100% rename from docs/tutorials/task.tanium-result-to-oscal-ar/800px-Australia_scarsdale_nimons_bridge.jpg rename to docs/tutorials/Transformers_and_Tasks/Tanium_result_to_oscal_ar/800px-Australia_scarsdale_nimons_bridge.jpg diff --git a/docs/tutorials/task.csv-to-oscal-cd/transformation.md b/docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd.md similarity index 79% rename from docs/tutorials/task.csv-to-oscal-cd/transformation.md rename to docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd.md index 304b21abf..13aa4898d 100644 --- a/docs/tutorials/task.csv-to-oscal-cd/transformation.md +++ b/docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd.md @@ -1,6 +1,11 @@ +--- +title: Converting CSVs to component definitions +description: Tutorial on how to setup and convert CSV spreadsheets into OSCAL component definitions +--- + # Tutorial: Setup for and use of standard format csv-file to OSCAL Component Definition json-file transformer -Here are step by step instructions for setup and transformation of [trestle standard format csv-file](ocp4-sample-input.csv) into OSCAL Component Definition [json-file](component-definition.json) using the [compliance-trestle](https://oscal-compass.github.io/compliance-trestle/) tool. +Here are step by step instructions for setup and transformation of [trestle standard format csv-file](csv_to_oscal_cd/ocp4-sample-input.csv) into OSCAL Component Definition [json-file](csv_to_oscal_cd/component-definition.json) using the [compliance-trestle](https://oscal-compass.github.io/compliance-trestle/) tool. ## *Objective* @@ -197,34 +202,45 @@ Make these changes: trestle.core.commands.task:101 WARNING: Config file was not configured with the appropriate section for the task: "[task.csv-to-oscal-cd]" Help information for csv-to-oscal-cd task. +Help information for csv-to-oscal-cd task. + Purpose: From csv produce OSCAL component_definition file. Configuration flags sit under [task.csv-to-oscal-cd]: - title = (required) the component definition title. - version = (required) the component definition version. - csv-file = (required) the path of the csv file. - required columns: Rule_Id - Rule_Description - Profile_Reference_URL - Profile_Description - Component_Type - Control_Mappings - Resource - optional columns: Parameter_Id - Parameter_Description - Parameter_Default_Value - Parameter_Value_Alternatives - Check_Id - Check_Description - Fetcher - Fetcher_Description - Resource_Instance_Type - output-dir = (required) the path of the output directory for synthesized OSCAL .json files. - namespace = (optional) the namespace for properties, e.g. https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd - user-namespace = (optional) the user-namespace for properties, e.g. https://oscal-compass.github.io/compliance-trestle/schemas/oscal/cd/user-defined - class.column-name = (optional) the class to associate with the specified column name, e.g. class.Rule_Id = scc_class - output-overwrite = (optional) true [default] or false; replace existing output when true. + title = (required) the component definition title. + version = (required) the component definition version. + csv-file = (required) the path of the csv file. [1st row are column headings; 2nd row are column descriptions; 3rd row and beyond is data] + required columns: $$Component_Title + $$Component_Description + $$Component_Type + $$Rule_Id + $$Rule_Description (see note 1) + $$Profile_Source (see note 1) + $$Profile_Description (see note 1) + $$Control_Id_List (see note 1) + $$Namespace + optional columns: $Check_Id (see note 2) + $Check_Description (see note 2) + $Target_Component (see note 3) + $Original_Risk_Rating (see note 1) + $Adjusted_Risk_Rating (see note 1) + $Risk_Adjustment (see note 1) + $Parameter_Id (see notes 1, 5) + $Parameter_Description (see notes 1, 5) + $Parameter_Value_Alternatives (see notes 1, 5) + comment columns: #Informational (see note 4) + output-dir = (required) the path of the output directory for synthesized OSCAL .json files. + component-definition = (optional) the path of the existing component-definition OSCAL .json file. + class.column-name = (optional) the class to associate with the specified column name, e.g. class.Rule_Id = scc_class + output-overwrite = (optional) true [default] or false; replace existing output when true. + validate-controls = (optional) on, warn, or off [default]; validate controls exist in resolved profile. + +Notes: [1] column is ignored for validation component type + [2] column is required for validation component type + [3] column is optional for validation component type, but may be needed to prevent Rule_Id collisions + [4] column name starting with # causes column to be ignored + [5] additional parameters are specified by adding a common suffix per set, for example: Parameter_Id_1, Parameter_Description_1, ...Parameter_Id_2... ``` @@ -237,14 +253,14 @@ Configuration flags sit under [task.csv-to-oscal-cd]: - Fetch sample csv-file. ``` -(venv.trestle)$ curl 'https://raw.githubusercontent.com/oscal-compass/compliance-trestle/main/docs/tutorials/task.csv-to-oscal-cd/ocp4-sample-input.csv' > adjunct-data/ocp4-sample-input.csv +(venv.trestle)$ curl 'https://raw.githubusercontent.com/oscal-compass/compliance-trestle/main/docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd/ocp4-sample-input.csv' > adjunct-data/ocp4-sample-input.csv ``` - Fetch trestle task file. ``` -(venv.trestle)$ curl 'https://raw.githubusercontent.com/oscal-compass/compliance-trestle/main/docs/tutorials/task.csv-to-oscal-cd/demo-csv-to-oscal-cd.config' > adjunct-data/task-files/demo-csv-to-oscal-cd.config +(venv.trestle)$ curl 'https://raw.githubusercontent.com/oscal-compass/compliance-trestle/main/docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd/demo-csv-to-oscal-cd.config' > adjunct-data/task-files/demo-csv-to-oscal-cd.config ```
@@ -451,3 +467,17 @@ Congratulations! You have completed this tutorial.

+----- + +# Examples: csv files suitable for csv-to-oscsl-cd transformation + +The examples given here comprise csv files that can be transformed into OSCAL Component Definitions. +The csv files comprise required headings and values expected by the trestle task transformer, and may present optional ones as well. + +1. OCP4 sample input + +This is a simple example csv that has just one rule per control and one check per rule: [ocp4-sample-input.csv](csv_to_oscal_cd/ocp4-sample-input.csv) + +2. Multiple occurrence sample input + +This is a simple example csv that has multiple checks per rule and multiple target-components per rule: [rule-name-overlap.csv](csv_to_oscal_cd/rule-name-overlap.csv) diff --git a/docs/tutorials/task.csv-to-oscal-cd/component-definition.json b/docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd/component-definition.json similarity index 100% rename from docs/tutorials/task.csv-to-oscal-cd/component-definition.json rename to docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd/component-definition.json diff --git a/docs/tutorials/task.csv-to-oscal-cd/demo-csv-to-oscal-cd.config b/docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd/demo-csv-to-oscal-cd.config similarity index 100% rename from docs/tutorials/task.csv-to-oscal-cd/demo-csv-to-oscal-cd.config rename to docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd/demo-csv-to-oscal-cd.config diff --git a/docs/tutorials/task.csv-to-oscal-cd/ocp4-sample-input.csv b/docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd/ocp4-sample-input.csv similarity index 100% rename from docs/tutorials/task.csv-to-oscal-cd/ocp4-sample-input.csv rename to docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd/ocp4-sample-input.csv diff --git a/docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd/rule-name-overlap.csv b/docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd/rule-name-overlap.csv new file mode 100644 index 000000000..7a4140dcc --- /dev/null +++ b/docs/tutorials/Transformers_and_Tasks/csv_to_oscal_cd/rule-name-overlap.csv @@ -0,0 +1,7 @@ +$$Component_Title,$$Component_Description,$$Component_Type,$$Rule_Id,$$Rule_Description,Check_Id,Check_Description,$$Namespace,Target_Component,$$Control_Id_List,$$Profile_Source,$$Profile_Description +OSCO,OSCO,validation,RULE-1.1,RULE1.1,Check.1,Check.1,http://oscal-compass/compliance-trestle/schemas/oscal/cd,Target-A,,, +OSCO,OSCO,validation,RULE-1.1,RULE1.1,Check.2,Check.2,http://oscal-compass/compliance-trestle/schemas/oscal/cd,Target-A,,, +OSCO,OSCO,validation,RULE-1.1,RULE1.1,Check.3,Check.3,http://oscal-compass/compliance-trestle/schemas/oscal/cd,Target-A,,, +OSCO,OSCO,validation,RULE-1.1,RULE1.1,Check.1,Check.1,http://oscal-compass/compliance-trestle/schemas/oscal/cd,Target-B,,, +OSCO,OSCO,validation,RULE-1.1,RULE1.1,Check.2,Check.2,http://oscal-compass/compliance-trestle/schemas/oscal/cd,Target-B,,, +OSCO,OSCO,validation,RULE-1.1,RULE1.1,Check.3,Check.3,http://oscal-compass/compliance-trestle/schemas/oscal/cd,Target-B,,, diff --git a/docs/tutorials/task.transformer-construction/transformer-construction.md b/docs/tutorials/Transformers_and_Tasks/transformer_construction.md similarity index 96% rename from docs/tutorials/task.transformer-construction/transformer-construction.md rename to docs/tutorials/Transformers_and_Tasks/transformer_construction.md index b6924437c..de123fb48 100644 --- a/docs/tutorials/task.transformer-construction/transformer-construction.md +++ b/docs/tutorials/Transformers_and_Tasks/transformer_construction.md @@ -1,9 +1,14 @@ +--- +title: Posture format with OSCAL assesment results +description: Tutorial on how to build a lite verision of Oscal Assessment Results with Trestle SDK from your posture result format +--- + # Tutorial: How to build an Oscal Assessment Results "lite" with Trestle SDK from your posture result format The compliance-trestle (trestle) project provides helpful modules to assist your standardization efforts. Discussed below are some best practices for automated bridging to NIST OSCAL. -## *Why NIST OSCAL?* +## Why NIST OSCAL? The Open Security Controls Assessment Language [OSCAL](https://pages.nist.gov/OSCAL) is a set of formats expressed in XML, JSON, and YAML that provide machine-readable representations of control catalogs, control baselines, system security plans, and assessment plans and results as adopted by the @@ -11,22 +16,22 @@ National Institute of Standards and Technology [NIST](https://pages.nist.gov/). Standardizing to OSCAL facilitates data interchange and understandability. -## *Objective* +## Objective The objective here is to transform your compliance data into valid OSCAL, in particular System Assessment Results [SAR](https://pages.nist.gov/OSCAL/documentation/schema/assessment-results-layer/). Examples of existing transformers included with trestle are for the OpenShift Compliance Operator [OSCO](https://github.com/oscal-compass/compliance-trestle/blob/develop/trestle/tasks/xccdf_result_to_oscal_ar.py) and -[Tanium](https://github.com/oscal-compass/compliance-trestle/blob/develop/trestle/tasks/tanium-result-to-oscal-ar.py). +[Tanium](https://github.com/oscal-compass/compliance-trestle/blob/develop/trestle/tasks/tanium_result_to_oscal_ar.py). -## *Overview* +## Overview You have a source of compliance data that is in non-OSCAL format (spreadsheet, XML, JSON, database, object-store...) and you would like to transform into standardized form in terms of NIST OSCAL. Presumed is an existing method for obtaining the compliance data from the cloud and materializing on disk as one or more files. -![transformer-construction](transformer-construction.jpg) +![transformer-construction](transformer_construction/transformer-construction.jpg) - Source files on disk (pink) is our starting point. - OSCAL files on disk (blue) is our ending point. @@ -43,7 +48,7 @@ auditree-arboretum [harvest](https://github.com/ComplianceAsCode/auditree-harves report (file interface) that employs the trestle xccdf-result-to-oscal-ar transformation (data processing) module. -## *Choose Mapping Strategy* +## Choose Mapping Strategy There are 3 potential levels of OSCAL Assessment Results that can be emitted by your transformer. From most complex to least complex they are: @@ -55,7 +60,7 @@ From most complex to least complex they are: Below is a snippet from the [SAR](https://pages.nist.gov/OSCAL/documentation/schema/assessment-results-layer/) model with these three levels shown. -![assessment-results](assessment-results.jpg) +![assessment-results](transformer_construction/assessment-results.jpg) Although producing a complete SAR is possible, this transformation is not covered here. We focus on partial results, either Observations only or Observations with Findings. @@ -407,7 +412,7 @@ There are 2 transformers in trestle. The [xccdf-result-to-oscal-ar](https://github.com/oscal-compass/compliance-trestle/blob/develop/trestle/tasks/xccdf_result_to_oscal_ar.py) transformer emits OSCAL Observations, the simplest partial result. -The [tanium-result-to-oscal-ar](https://github.com/oscal-compass/compliance-trestle/blob/develop/trestle/tasks/tanium-result-to-oscal-ar.py) +The [tanium-result-to-oscal-ar](https://github.com/oscal-compass/compliance-trestle/blob/develop/trestle/tasks/tanium_result_to_oscal_ar.py) transformer emits OSCAL Findings, a more complex partial result. Table of approximate lines of code. @@ -438,7 +443,7 @@ Table of approximate lines of code. ## *Contributing* Consider contributing your transformer to -[trestle](../../contributing/mkdocs_contributing.md) +[trestle](../../contributing/index.md) or [auditree-arboretum](https://github.com/ComplianceAsCode/auditree-arboretum/blob/main/CONTRIBUTING.md) or diff --git a/docs/tutorials/task.transformer-construction/assessment-results-nist.png b/docs/tutorials/Transformers_and_Tasks/transformer_construction/assessment-results-nist.png similarity index 100% rename from docs/tutorials/task.transformer-construction/assessment-results-nist.png rename to docs/tutorials/Transformers_and_Tasks/transformer_construction/assessment-results-nist.png diff --git a/docs/tutorials/task.transformer-construction/assessment-results.drawio b/docs/tutorials/Transformers_and_Tasks/transformer_construction/assessment-results.drawio similarity index 100% rename from docs/tutorials/task.transformer-construction/assessment-results.drawio rename to docs/tutorials/Transformers_and_Tasks/transformer_construction/assessment-results.drawio diff --git a/docs/tutorials/task.transformer-construction/assessment-results.jpg b/docs/tutorials/Transformers_and_Tasks/transformer_construction/assessment-results.jpg similarity index 100% rename from docs/tutorials/task.transformer-construction/assessment-results.jpg rename to docs/tutorials/Transformers_and_Tasks/transformer_construction/assessment-results.jpg diff --git a/docs/tutorials/task.transformer-construction/transformer-construction.drawio b/docs/tutorials/Transformers_and_Tasks/transformer_construction/transformer-construction.drawio similarity index 100% rename from docs/tutorials/task.transformer-construction/transformer-construction.drawio rename to docs/tutorials/Transformers_and_Tasks/transformer_construction/transformer-construction.drawio diff --git a/docs/tutorials/task.transformer-construction/transformer-construction.jpg b/docs/tutorials/Transformers_and_Tasks/transformer_construction/transformer-construction.jpg similarity index 100% rename from docs/tutorials/task.transformer-construction/transformer-construction.jpg rename to docs/tutorials/Transformers_and_Tasks/transformer_construction/transformer-construction.jpg diff --git a/docs/tutorials/ssp_profile_catalog_authoring/ssp_profile_catalog_authoring.md b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring.md similarity index 99% rename from docs/tutorials/ssp_profile_catalog_authoring/ssp_profile_catalog_authoring.md rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring.md index 9a1d2acbc..3a8881692 100644 --- a/docs/tutorials/ssp_profile_catalog_authoring/ssp_profile_catalog_authoring.md +++ b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring.md @@ -61,19 +61,19 @@ First, a *Catalog* is a collection of *Controls*, and a *Profile* imports contro For clarity, here is a simple depicton of a catalog as a collection of controls: -![Simple catalog](simple_catalog.png) +![Simple catalog](ssp_profile_catalog_authoring/simple_catalog.png) Here is a profile pulling controls from a catalog to make a resolved profile catalog: -![Resolved profile catalog](resolved_profile_catalog.png) +![Resolved profile catalog](ssp_profile_catalog_authoring/resolved_profile_catalog.png) And here is a more complex situation where a single profile pulls controls from catalogs and profiles: -![Complex resolved profile catalog](complex_resolved_profile_catalog.png) +![Complex resolved profile catalog](ssp_profile_catalog_authoring/complex_resolved_profile_catalog.png) From the diagram it's clear that the profile is performing many tasks under the covers. This is shown in an expanded view of a profile: -![What a profile does](profile_does.png) +![What a profile does](ssp_profile_catalog_authoring/profile_does.png) It's important to note that each profile is importing a selection of controls from each source, then making its own *suggested* modifications to parameters and other content in those controls. They are suggested in the sense that downstream profiles may override those settings - with priority given to the later profiles in the pipeline. The changes made by upstream profiles may be accepted, or overridden by better choices for a given need. This way the catalogs themselves can remain relatively static, and individual use cases can effectively create a custom catalog based on the original controls plus modifications by other static profiles, and/or the user's custom profile. The authoring tools here provide ways to make those modifications, both to the catalog controls and to the profiles, and to enter the implementation responses that are needed in a System Security Plan. @@ -793,8 +793,7 @@ The markdown header lists all the rules that apply to this control, along with t The values for rule parameters are specified using the normal `SetParameter` mechanism in the ControlImplementation, but it's important to note that there are two different types of `SetParameter`: Those that apply to the normal parameters of the control, and those that apply strictly to the rules. -Note that markdown for a control is only created if there are rules associated with the control, and within the markdown the only parts written out that -prompt for responses are parts that have rules assigned. Thus the output markdown directory may be highly pruned of both controls and groups of controls if only some controls have rules associated. +Note that markdown is created for all of the controls in the `Component` control implementation. However, when processing control parts, the part is only written out if there are associated rules or pre-filled implementation descriptions. In addition, the rules should be regarded as read-only from the editing perspective, and you cannot change the rules associated with a control or its parts. But you may edit the rule parameter values as described in the comments of the markdown file under `x-trestle-comp-def-rules-param-vals`. You may also edit the prose and implementation status associated with a statement part at the bottom of the markdown file. @@ -1223,6 +1222,6 @@ The options shown are fairly consistent across the `-generate` and `-assemble` f `ssp-generate` is special because it starts with a profile rather than an ssp, whereas `catalog-generate` and `profile-generate` both start with a parent model of the same type. Nonetheless, you still have an option during `ssp-assemble` to use a given json file as the template into which new content is inserted, and once again you may overwrite that original json file or direct it to a new one using `--output`. -![Table of authoring tool options](trestle_ssp_author_options.png) +![Table of authoring tool options](ssp_profile_catalog_authoring/trestle_ssp_author_options.png)
diff --git a/docs/tutorials/ssp_profile_catalog_authoring/complex_resolved_profile_catalog.drawio b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/complex_resolved_profile_catalog.drawio similarity index 100% rename from docs/tutorials/ssp_profile_catalog_authoring/complex_resolved_profile_catalog.drawio rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/complex_resolved_profile_catalog.drawio diff --git a/docs/tutorials/ssp_profile_catalog_authoring/complex_resolved_profile_catalog.png b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/complex_resolved_profile_catalog.png similarity index 100% rename from docs/tutorials/ssp_profile_catalog_authoring/complex_resolved_profile_catalog.png rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/complex_resolved_profile_catalog.png diff --git a/docs/tutorials/ssp_profile_catalog_authoring/profile_does.drawio b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/profile_does.drawio similarity index 100% rename from docs/tutorials/ssp_profile_catalog_authoring/profile_does.drawio rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/profile_does.drawio diff --git a/docs/tutorials/ssp_profile_catalog_authoring/profile_does.png b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/profile_does.png similarity index 100% rename from docs/tutorials/ssp_profile_catalog_authoring/profile_does.png rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/profile_does.png diff --git a/docs/tutorials/ssp_profile_catalog_authoring/resolved_profile_catalog.drawio b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/resolved_profile_catalog.drawio similarity index 100% rename from docs/tutorials/ssp_profile_catalog_authoring/resolved_profile_catalog.drawio rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/resolved_profile_catalog.drawio diff --git a/docs/tutorials/ssp_profile_catalog_authoring/resolved_profile_catalog.png b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/resolved_profile_catalog.png similarity index 100% rename from docs/tutorials/ssp_profile_catalog_authoring/resolved_profile_catalog.png rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/resolved_profile_catalog.png diff --git a/docs/tutorials/ssp_profile_catalog_authoring/resolved_profile_diagram.drawio b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/resolved_profile_diagram.drawio similarity index 100% rename from docs/tutorials/ssp_profile_catalog_authoring/resolved_profile_diagram.drawio rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/resolved_profile_diagram.drawio diff --git a/docs/tutorials/ssp_profile_catalog_authoring/resolved_profile_diagram.png b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/resolved_profile_diagram.png similarity index 100% rename from docs/tutorials/ssp_profile_catalog_authoring/resolved_profile_diagram.png rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/resolved_profile_diagram.png diff --git a/docs/tutorials/ssp_profile_catalog_authoring/simple_catalog.drawio b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/simple_catalog.drawio similarity index 100% rename from docs/tutorials/ssp_profile_catalog_authoring/simple_catalog.drawio rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/simple_catalog.drawio diff --git a/docs/tutorials/ssp_profile_catalog_authoring/simple_catalog.png b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/simple_catalog.png similarity index 100% rename from docs/tutorials/ssp_profile_catalog_authoring/simple_catalog.png rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/simple_catalog.png diff --git a/docs/tutorials/ssp_profile_catalog_authoring/ssp_profile_options.docx b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/ssp_profile_options.docx similarity index 100% rename from docs/tutorials/ssp_profile_catalog_authoring/ssp_profile_options.docx rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/ssp_profile_options.docx diff --git a/docs/tutorials/ssp_profile_catalog_authoring/trestle_ssp_author_options.png b/docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/trestle_ssp_author_options.png similarity index 100% rename from docs/tutorials/ssp_profile_catalog_authoring/trestle_ssp_author_options.png rename to docs/tutorials/Trestle_authoring/ssp_profile_catalog_authoring/trestle_ssp_author_options.png diff --git a/docs/trestle_author.md b/docs/tutorials/Trestle_authoring/trestle_author.md similarity index 98% rename from docs/trestle_author.md rename to docs/tutorials/Trestle_authoring/trestle_author.md index e69dfb393..9ddffa333 100644 --- a/docs/trestle_author.md +++ b/docs/tutorials/Trestle_authoring/trestle_author.md @@ -1,3 +1,8 @@ +--- +title: Governance of Authored Documents +description: Tutorial on governing authored documents with trestle +--- + # Trestle CLI for Governance of Authored Documents This document is organized in a multiple collapsable sections for ease of use. @@ -188,11 +193,11 @@ Drawio or [diagrams.net](https://app.diagrams.net/) is a diagramming platform wh Drawio (or `mxgraph`) files have a set of data fields. In a drawio file this is available in the edit menu as *edit data*. The diagram below shows how to access the (meta)data. -![Accessing the drawio data editor](assets/drawio_data_menu.png "Accessing the drawio data editor") +![Accessing the drawio data editor](trestle_author/drawio_data_menu.png "Accessing the drawio data editor") The data presents as a set of key-value pairs which can be edited (see below). The data is bound to each tab in a drawio file. The trestle CLI currently expects that metadata (whether from the template or file to be measured) is in the first tab when editing the draw io file. -![Editing drawio data](assets/drawio_editing_data.png "Editing drawio data") +![Editing drawio data](trestle_author/drawio_editing_data.png "Editing drawio data") @@ -622,7 +627,7 @@ Please follow steps in the section `Setting up the Trestle Workspace` if you don Trestle provides the capability to version the templates and the documents via `x-trestle-template-version` field in the header. Consider an example where we have a governed document called `Decision 1` that we now need to update to contain a new header field `approved-status` and a new required heading `Heading n` at the end, as demonstrated in the Figure below: -![Decision document update](assets/template_versioning.png) +![Decision document update](trestle_author/template_versioning.png) The intended workflow in this scenario is to: diff --git a/docs/assets/drawio_data_menu.png b/docs/tutorials/Trestle_authoring/trestle_author/drawio_data_menu.png similarity index 100% rename from docs/assets/drawio_data_menu.png rename to docs/tutorials/Trestle_authoring/trestle_author/drawio_data_menu.png diff --git a/docs/assets/drawio_editing_data.png b/docs/tutorials/Trestle_authoring/trestle_author/drawio_editing_data.png similarity index 100% rename from docs/assets/drawio_editing_data.png rename to docs/tutorials/Trestle_authoring/trestle_author/drawio_editing_data.png diff --git a/docs/assets/sample_ssp.md.jinja b/docs/tutorials/Trestle_authoring/trestle_author/sample_ssp.md.jinja similarity index 100% rename from docs/assets/sample_ssp.md.jinja rename to docs/tutorials/Trestle_authoring/trestle_author/sample_ssp.md.jinja diff --git a/docs/assets/template_versioning.png b/docs/tutorials/Trestle_authoring/trestle_author/template_versioning.png similarity index 100% rename from docs/assets/template_versioning.png rename to docs/tutorials/Trestle_authoring/trestle_author/template_versioning.png diff --git a/docs/trestle_author_jinja.md b/docs/tutorials/Trestle_authoring/trestle_author_jinja.md similarity index 80% rename from docs/trestle_author_jinja.md rename to docs/tutorials/Trestle_authoring/trestle_author_jinja.md index 45001f513..289633883 100644 --- a/docs/trestle_author_jinja.md +++ b/docs/tutorials/Trestle_authoring/trestle_author_jinja.md @@ -1,3 +1,8 @@ +--- +title: Output templating with trestle author jinja +description: Tutorial on how to use jinja for output templating support when converting oscal documents to markdown or word documents +--- + # Trestle author jinja - output templating support for oscal documents. Unfortunately OSCAL documents are not yet universally accepted. Therefore to support various OSCAL and non-OSCAL compliance workflows `trestle author jinja` is designed to provide end users with the ability to use jinja to produce customized output. This complements the more structured commands `trestle author catalog-{assemble|generate}`, `trestle author profile-{assemble|generate}` and `trestle author ssp-{assemble|generate}` and allows arbitrary use of jinja. @@ -36,9 +41,9 @@ Note the examples here use markdown, however, jinja can quite easily target xml Below is a sample jinja template for SSP. -| template | Description | Optional args required | -| ------------------------------------------------- | ---------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- | -| [Simple SSP template](assets/sample_ssp.md.jinja) | Sample ssp jinja template which prints out all control responses and includes a front-matter section | `-ssp` and `-p` for the ssp json and corresponding profile, respectively. Also requires a `frontmatter.md` file | +| template | Description | Optional args required | +| --------------------------------------------------------- | ---------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- | +| [Simple SSP template](trestle_author/sample_ssp.md.jinja) | Sample ssp jinja template which prints out all control responses and includes a front-matter section | `-ssp` and `-p` for the ssp json and corresponding profile, respectively. Also requires a `frontmatter.md` file | ## Variable availability in the jinja template. @@ -113,7 +118,7 @@ Trestle provides custom jinja tags for use specifically with markdown: `mdsectio 1. `{% md_clean_include 'path_to_file.md' heading_level=2 %}` 1. The heading level argument adjusts to (based on the number of hashes) the most significant heading in the document, if headings exist. -`mdsection_include` is similar to the native `md_clean_include` except that.: +`mdsection_include` is similar to `md_clean_include` except that: 1. `mdsection_include` requires an second positional argument which is the title of a heading, from a markdown file, which you want the content from. @@ -129,6 +134,23 @@ Trestle provides custom jinja tags for use specifically with markdown: `mdsectio 1. `format` where a python [datetime strftime format string](https://docs.python.org/3/library/datetime.html#strftime-and-strptime-format-codes) is provided to format the output. E.g. `{% md_datestamp format='%B %d, %Y' %}` results in `December 28, 2021` being inserted. 1. `newline` is a boolean to control the addition of a double newline after the inserted date string. For example `{% md_datestamp newline=false %}` inserts a date in the default format, without additional newlines. +## Custom Jinja filters. + +Trestle provides custom jinja filters for help processing SSP data. + +- `as_list` will return the passed value, or an empty list if `None` is passed in. + - Example: `{% for party in ssp.metadata.parties | as_list %}` +- `get_default` operates the same as the built-in Jinja `default` filter, with the optional second parameter set to `True` + - Example: `{{ control_interface.get_prop(user, 'user-property') | get_default('[Property]') }}` +- `first_or_none` will return the first element of a list, or `None` if the list is empty or `None` itself. + - Example: `{% set address = party.addresses | first_or_none %}` +- `get_party` will return the `Party` found in `ssp.metadata.parties` for a given `uuid` + - Example: `{% set organization = party.member_of_organizations | first_or_none | get_party(ssp) %}` +- `parties_for_role` will yield individual `Party` entries when given a list of `ResponsibleParty` and a `role-id` + - Example: `{% for party in ssp.metadata.responsible_parties | parties_for_role("prepared-by", ssp) %}` +- `diagram_href` will return the `Link.href` where `Link.rel == 'diagram'` when given a `Diagram` object + - Example: `![{{diagram.caption}}]({{ diagram | diagram_href }})` + ## Generate controls as individual markdown pages. Trestle's Jinja functionality allows its users to generate individual markdown pages for each control from a resolved profile catalog. Such functionality can be used later on to pack individual pages into docs of various formats. @@ -144,17 +166,17 @@ To achieve that, we can create a simple Jinja template that would be used to gen {{ control_writer.write_control_with_sections( control, profile, - group_title, - ['statement', 'objective', 'expected_evidence', 'implementation_guidance', 'table_of_parameters'], + group_title, + ['statement', 'objective', 'expected_evidence', 'implementation_guidance', 'table_of_parameters'], { 'statement':'Control Statement', - 'objective':'Control Objective', - 'expected_evidence':'Expected Evidence', - 'implementation_guidance':'Implementation Guidance', + 'objective':'Control Objective', + 'expected_evidence':'Expected Evidence', + 'implementation_guidance':'Implementation Guidance', 'table_of_parameters':'Control Parameters' } - ) - + ) + | safe }} ``` diff --git a/docs/cli.md b/docs/tutorials/cli.md similarity index 99% rename from docs/cli.md rename to docs/tutorials/cli.md index f7ef55b9e..ae91b4662 100644 --- a/docs/cli.md +++ b/docs/tutorials/cli.md @@ -1,4 +1,9 @@ -# trestle CLI Overview and OSCAL Usecases +--- +title: trestle CLI Overview +description: An introductory tutorial into trestle's CLI and OSCAL use cases +--- + +# trestle CLI Overview and OSCAL usecases The trestle CLI has three primary use cases: @@ -113,11 +118,11 @@ Users can query the contents of files using `trestle describe`, and probe the co OSCAL models are rich and contain multiple nested data structures. Given this, a mechanism is required to address _elements_ /_attributes_ within an oscal object. -This accessing method is called 'element path' and is similar to _jsonPath_. Commands provide element path by a `-e` argument where available, e.g. trestle split -f catalog.json -e 'catalog.metadata.\*'. This path is used whenever specifying an attribute or model, rather than exposing trestle's underlying object model name. Users can refer to [NIST's json outline](https://pages.nist.gov/OSCAL/reference/latest/complete/json-outline/) to understand object names in trestle. +This accessing method is called 'element path' and is similar to _jsonPath_. Commands provide element path by a `-e` argument where available, e.g. trestle split -f catalog.json -e 'catalog.metadata.\*'. This path is used whenever specifying an attribute or model, rather than exposing trestle's underlying object model name. Users can refer to [NIST's json outline](https://pages.nist.gov/OSCAL-Reference/models/latest/complete/json-outline/) to understand object names in trestle. ### Rules for element path -1. Element path is an expression of the attribute names, [in json form](https://pages.nist.gov/OSCAL/reference/latest/complete/json-outline/) , concatenated by a period (`.`). +1. Element path is an expression of the attribute names, [in json form](https://pages.nist.gov/OSCAL-Reference/models/latest/complete/json-outline/) , concatenated by a period (`.`). 1. E.g. The metadata in a catalog is referred to as `catalog.metadata` 1. Element paths are relative to the file. 1. e.g. For `metadata.json` roles would be referred to as `metadata.roles`, from the catalog file that would be `catalog.metadata.roles` diff --git a/docs/tutorials/continuous-compliance/continuous-compliance.md b/docs/tutorials/compliance_posture.md similarity index 71% rename from docs/tutorials/continuous-compliance/continuous-compliance.md rename to docs/tutorials/compliance_posture.md index 0bd7e0d3e..9b91a1a94 100644 --- a/docs/tutorials/continuous-compliance/continuous-compliance.md +++ b/docs/tutorials/compliance_posture.md @@ -1,3 +1,8 @@ +--- +title: What's your compliance posture +description: High level tutorial on measuring your compliance posture with compliance-trestle +--- + # Tutorial: What’s your compliance posture? #### Introduction @@ -17,15 +22,15 @@ Moreover, assuring continuous compliance across multiple cloud vendors can compl Common sense dictates that standardization would simplify matters. The National Institute of Standards and Technologies (NIST) is developing the Open Security Controls Assessment Language ([OSCAL](https://pages.nist.gov/OSCAL)). -The compliance-[trestle](https://oscal-compass.github.io/compliance-trestle/) open source github project is an effort to employ [OSCAL](https://pages.nist.gov/OSCAL) for compliance standardization and automation. Of great utility is the [trestle](https://oscal-compass.github.io/compliance-trestle/) oscal module that facilitates transformation of data to/from Python object representations in accordance with the [OSCAL](https://pages.nist.gov/OSCAL) schemas. +The compliance-[trestle](../index.md) open source github project is an effort to employ [OSCAL](https://pages.nist.gov/OSCAL) for compliance standardization and automation. Of great utility is the [trestle](../index.md) oscal module that facilitates transformation of data to/from Python object representations in accordance with the [OSCAL](https://pages.nist.gov/OSCAL) schemas. #### Simple Continuous Compliance Architecture -![Continuous Compliance Reporting](ContinuousCompliance.jpg) +![Continuous Compliance Reporting](./compliance_posture/ContinuousCompliance.jpg) Cloud Services can often be configured to monitor (and sometimes enforce) policies. Examples include OpenShift Compliance Operator and Tanium. However, the compliance reporting “raw” data produced is unique to each. -Two steps are needed to ascertain your compliance posture. Step 1 is to transform available compliance “raw” data into standardized form ([OSCAL](https://pages.nist.gov/OSCAL)). Step 2 is to examine the [OSCAL](https://pages.nist.gov/OSCAL) data and assemble a compliance posture for the controls and components of interest. And [trestle](https://oscal-compass.github.io/compliance-trestle/) is the go-to solution. +Two steps are needed to ascertain your compliance posture. Step 1 is to transform available compliance “raw” data into standardized form ([OSCAL](https://pages.nist.gov/OSCAL)). Step 2 is to examine the [OSCAL](https://pages.nist.gov/OSCAL) data and assemble a compliance posture for the controls and components of interest. And [trestle](../index.md) is the go-to solution. #### Step 1 – Transformation @@ -33,14 +38,14 @@ The bad news is that a transformer to [OSCAL](https://pages.nist.gov/OSCAL) is n However, there is plenty of good news: -- a transformer for your Cloud Service type may already exist, such as: [Tanium to OSCAL](https://github.com/oscal-compass/compliance-trestle/blob/main/trestle/tasks/tanium-result-to-oscal-ar.py), [OpenShift Compliance Operator to OSCAL](https://github.com/oscal-compass/compliance-trestle/blob/main/trestle/tasks/xccdf_result_to_oscal_ar.py) +- a transformer for your Cloud Service type may already exist, such as: [Tanium to OSCAL](https://github.com/oscal-compass/compliance-trestle/blob/main/trestle/tasks/tanium_result_to_oscal_ar.py), [OpenShift Compliance Operator to OSCAL](https://github.com/oscal-compass/compliance-trestle/blob/main/trestle/tasks/xccdf_result_to_oscal_ar.py) - once a transformer for a Cloud Service type has been written, it can be open-sourced/re-used -- writing a transformer is fairly easy: just a few lines of Python code using [trestle](https://oscal-compass.github.io/compliance-trestle/) as a foundation +- writing a transformer is fairly easy: just a few lines of Python code using [trestle](../index.md) as a foundation In the case of Tanium, the [OSCAL](https://pages.nist.gov/OSCAL) compliance data document is a *System Assessment Results* fragment with *Findings* and *Observations*, while in the case of OpenShift Compliance Operator there are *Observations* only. -Tutorials are available to show you: how to [run a transformer](https://oscal-compass.github.io/compliance-trestle/tutorials/task.tanuim-to-oscal/transformation/), how to [write a transformer](https://oscal-compass.github.io/compliance-trestle/tutorials/task.transformer-construction/transformer-construction/). +Tutorials are available to show you: how to [run a transformer](Transformers_and_Tasks/Tanium_result_to_oscal_ar.md), how to [write a transformer](Transformers_and_Tasks/transformer_construction.md). #### Step 2 – Reporting -Coming soon is a [trestle](https://oscal-compass.github.io/compliance-trestle/) tool to assemble the [OSCAL](https://pages.nist.gov/OSCAL) fragments documents together using [OSCAL](https://pages.nist.gov/OSCAL) compliance configuration data (*System Assessment Plan* and *System Security Plan*) into a complete *System Assessment Results*. +Coming soon is a [trestle](../index.md) tool to assemble the [OSCAL](https://pages.nist.gov/OSCAL) fragments documents together using [OSCAL](https://pages.nist.gov/OSCAL) compliance configuration data (*System Assessment Plan* and *System Security Plan*) into a complete *System Assessment Results*. diff --git a/docs/tutorials/continuous-compliance/ContinuousCompliance.drawio b/docs/tutorials/compliance_posture/ContinuousCompliance.drawio similarity index 100% rename from docs/tutorials/continuous-compliance/ContinuousCompliance.drawio rename to docs/tutorials/compliance_posture/ContinuousCompliance.drawio diff --git a/docs/tutorials/continuous-compliance/ContinuousCompliance.jpg b/docs/tutorials/compliance_posture/ContinuousCompliance.jpg similarity index 100% rename from docs/tutorials/continuous-compliance/ContinuousCompliance.jpg rename to docs/tutorials/compliance_posture/ContinuousCompliance.jpg diff --git a/docs/tutorials/trestle_sample_workflow.md b/docs/tutorials/introduction_to_trestle.md similarity index 99% rename from docs/tutorials/trestle_sample_workflow.md rename to docs/tutorials/introduction_to_trestle.md index 5e9bcfdee..ddaf596f4 100644 --- a/docs/tutorials/trestle_sample_workflow.md +++ b/docs/tutorials/introduction_to_trestle.md @@ -1,3 +1,8 @@ +--- +title: Introduction to trestle workflows +description: Introductory Tutorial to trestle workflows for managing OSCAL objects as code +--- + # Tutorial: Introduction to trestle workflow Here are step-by-step instructions to manipulate a [NIST](https://www.nist.gov/) standard [OSCAL](https://pages.nist.gov/OSCAL/) catalog using the [compliance-trestle](https://oscal-compass.github.io/compliance-trestle/) (`"trestle"`) tool. @@ -6,7 +11,7 @@ Here are step-by-step instructions to manipulate a [NIST](https://www.nist.gov/) Learn how to split and merge an OSCAL catalog json file using trestle commands and its command line interface (CLI). Trestle simplifies the manipulation and management of large OSCAL documents by allowing controlled deconstruction into smaller components, and later reconstruction after editing those components. And all operations guarantee that the individual files conform to the corresponding OSCAL schema to maintain integrity of the document in the process. -This tutorial assumes you have installed Python and installed trestle in a virtual environment per the directions found [here](../python_trestle_setup.md). +This tutorial assumes you have installed Python and installed trestle in a virtual environment per the directions found [here](../installation.md). The examples shown will work for linux and mac, but Windows will require the following modifications: diff --git a/images/trestle-OSCAL-upgrade.png b/images/trestle-OSCAL-upgrade.png index eae3bb6ef..63e73799f 100644 Binary files a/images/trestle-OSCAL-upgrade.png and b/images/trestle-OSCAL-upgrade.png differ diff --git a/mkdocs.yml b/mkdocs.yml index 26b7a9821..51c762f3e 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -3,6 +3,10 @@ extra: analytics: property: G-XT3KGMHSY8 provider: google + consent: + title: Cookie consent + description: >- + We use cookies to recognize your repeated visits and preferences, as well as to measure the effectiveness of our documentation and whether users find what they're searching for. With your consent, you're helping us to make our documentation better. markdown_extensions: - admonition - markdown_include.include @@ -17,186 +21,29 @@ markdown_extensions: - pymdownx.snippets - toc: permalink: ¤ -nav: -- Overview: index.md -- Installation: python_trestle_setup.md -- Tutorials: - - Intro to trestle workflow: tutorials/trestle_sample_workflow.md - - Compliance posture: tutorials/continuous-compliance/continuous-compliance.md - - Trestle Authoring: - - Governance of Authored Documents: trestle_author.md - - Catalog, Profile, ComponentDefinition, and SSP Authoring: tutorials/ssp_profile_catalog_authoring/ssp_profile_catalog_authoring.md - - Trestle Transformers and Tasks: - - Transformer construction: tutorials/task.transformer-construction/transformer-construction.md - - Task - task.csv-to-oscal-cd: tutorials/task.csv-to-oscal-cd/transformation.md - - Task - ocp4-cis-profile-to-oscal-catalog: tutorials/task.ocp4-cis-profile-to-oscal-catalog/transformation.md - - Task - ocp4-cis-profile-to-oscal-cd: tutorials/task.ocp4-cis-profile-to-oscal-cd/transformation.md - - Task - tanium-result-to-oscal-ar: tutorials/task.tanium-result-to-oscal-ar/transformation.md - - Trestle command-line interface (CLI): - - CLI for OSCAL documents: cli.md - - CLI for Jinja Template processing: trestle_author_jinja.md -- Contributing: - - Code of Conduct: mkdocs_code_of_conduct.md - - Contributing overview: contributing/mkdocs_contributing.md - - Contributors: https://github.com/oscal-compass/compliance-trestle/graphs/contributors - - Maintainers: maintainers.md - - Documentation website: contributing/website.md - - Trestle's object model: contributing/trestle_oscal_object_model.md - - Developer Certificate of Originality: contributing/DCO.md - - Trestle plugin mechanism: contributing/plugins.md -- Known limitations: errors.md -- Demos: demonstrations-content.md -- Plugins: - - FedRAMP validation: plugins/compliance-trestle-fedramp.md -- License: license.md -- Reference: - - Integrating with IBM SCC: reference/third-party-result-schema-SCC.md - - trestle API reference: - - cli: api_reference/trestle.cli.md - - common: - - common_types: api_reference/trestle.common.common_types.md - - const: api_reference/trestle.common.const.md - - err: api_reference/trestle.common.err.md - - file_utils: api_reference/trestle.common.file_utils.md - - list_utils: api_reference/trestle.common.list_utils.md - - load_validate: api_reference/trestle.common.load_validate.md - - log: api_reference/trestle.common.log.md - - model_utils: api_reference/trestle.common.model_utils.md - - str_utils: api_reference/trestle.common.str_utils.md - - trash: api_reference/trestle.common.trash.md - - type_utils: api_reference/trestle.common.type_utils.md - - core: - - all_validator: api_reference/trestle.core.all_validator.md - - base_model: api_reference/trestle.core.base_model.md - - catalog: - - catalog_api: api_reference/trestle.core.catalog.catalog_api.md - - catalog_interface: api_reference/trestle.core.catalog.catalog_interface.md - - catalog_merger: api_reference/trestle.core.catalog.catalog_merger.md - - catalog_reader: api_reference/trestle.core.catalog.catalog_reader.md - - catalog_writer: api_reference/trestle.core.catalog.catalog_writer.md - - catalog_validator: api_reference/trestle.core.catalog_validator.md - - commands: - - add: api_reference/trestle.core.commands.add.md - - assemble: api_reference/trestle.core.commands.assemble.md - - author: - - catalog: api_reference/trestle.core.commands.author.catalog.md - - command: api_reference/trestle.core.commands.author.command.md - - common: api_reference/trestle.core.commands.author.common.md - - component: api_reference/trestle.core.commands.author.component.md - - consts: api_reference/trestle.core.commands.author.consts.md - - docs: api_reference/trestle.core.commands.author.docs.md - - folders: api_reference/trestle.core.commands.author.folders.md - - headers: api_reference/trestle.core.commands.author.headers.md - - jinja: api_reference/trestle.core.commands.author.jinja.md - - prof: api_reference/trestle.core.commands.author.prof.md - - ssp: api_reference/trestle.core.commands.author.ssp.md - - versioning: - - template_versioning: api_reference/trestle.core.commands.author.versioning.template_versioning.md - - command_docs: api_reference/trestle.core.commands.command_docs.md - - common: - - cmd_utils: api_reference/trestle.core.commands.common.cmd_utils.md - - return_codes: api_reference/trestle.core.commands.common.return_codes.md - - create: api_reference/trestle.core.commands.create.md - - describe: api_reference/trestle.core.commands.describe.md - - href: api_reference/trestle.core.commands.href.md - - import_: api_reference/trestle.core.commands.import_.md - - init: api_reference/trestle.core.commands.init.md - - merge: api_reference/trestle.core.commands.merge.md - - partial_object_validate: api_reference/trestle.core.commands.partial_object_validate.md - - remove: api_reference/trestle.core.commands.remove.md - - replicate: api_reference/trestle.core.commands.replicate.md - - split: api_reference/trestle.core.commands.split.md - - task: api_reference/trestle.core.commands.task.md - - validate: api_reference/trestle.core.commands.validate.md - - version: api_reference/trestle.core.commands.version.md - - control_context: api_reference/trestle.core.control_context.md - - control_interface: api_reference/trestle.core.control_interface.md - - control_reader: api_reference/trestle.core.control_reader.md - - control_writer: api_reference/trestle.core.control_writer.md - - crm: - - bycomp_interface: api_reference/trestle.core.crm.bycomp_interface.md - - export_reader: api_reference/trestle.core.crm.export_reader.md - - export_writer: api_reference/trestle.core.crm.export_writer.md - - leveraged_statements: api_reference/trestle.core.crm.leveraged_statements.md - - ssp_inheritance_api: api_reference/trestle.core.crm.ssp_inheritance_api.md - - docs_control_writer: api_reference/trestle.core.docs_control_writer.md - - draw_io: api_reference/trestle.core.draw_io.md - - duplicates_validator: api_reference/trestle.core.duplicates_validator.md - - generators: api_reference/trestle.core.generators.md - - generic_oscal: api_reference/trestle.core.generic_oscal.md - - jinja: api_reference/trestle.core.jinja.md - - links_validator: api_reference/trestle.core.links_validator.md - - markdown: - - base_markdown_node: api_reference/trestle.core.markdown.base_markdown_node.md - - control_markdown_node: api_reference/trestle.core.markdown.control_markdown_node.md - - docs_markdown_node: api_reference/trestle.core.markdown.docs_markdown_node.md - - markdown_api: api_reference/trestle.core.markdown.markdown_api.md - - markdown_const: api_reference/trestle.core.markdown.markdown_const.md - - markdown_processor: api_reference/trestle.core.markdown.markdown_processor.md - - markdown_validator: api_reference/trestle.core.markdown.markdown_validator.md - - md_writer: api_reference/trestle.core.markdown.md_writer.md - - models: - - actions: api_reference/trestle.core.models.actions.md - - elements: api_reference/trestle.core.models.elements.md - - file_content_type: api_reference/trestle.core.models.file_content_type.md - - interfaces: api_reference/trestle.core.models.interfaces.md - - plans: api_reference/trestle.core.models.plans.md - - object_factory: api_reference/trestle.core.object_factory.md - - parser: api_reference/trestle.core.parser.md - - pipeline: api_reference/trestle.core.pipeline.md - - profile_resolver: api_reference/trestle.core.profile_resolver.md - - refs_validator: api_reference/trestle.core.refs_validator.md - - remote: - - cache: api_reference/trestle.core.remote.cache.md - - repository: api_reference/trestle.core.repository.md - - resolver: - - merge: api_reference/trestle.core.resolver.merge.md - - modify: api_reference/trestle.core.resolver.modify.md - - prune: api_reference/trestle.core.resolver.prune.md - - rule_parameters_validator: api_reference/trestle.core.rule_parameters_validator.md - - ssp_io: api_reference/trestle.core.ssp_io.md - - trestle_base_model: api_reference/trestle.core.trestle_base_model.md - - validator: api_reference/trestle.core.validator.md - - validator_factory: api_reference/trestle.core.validator_factory.md - - oscal: - - assessment_plan: api_reference/trestle.oscal.assessment_plan.md - - assessment_results: api_reference/trestle.oscal.assessment_results.md - - catalog: api_reference/trestle.oscal.catalog.md - - common: api_reference/trestle.oscal.common.md - - component: api_reference/trestle.oscal.component.md - - poam: api_reference/trestle.oscal.poam.md - - profile: api_reference/trestle.oscal.profile.md - - ssp: api_reference/trestle.oscal.ssp.md - - tasks: - - base_task: api_reference/trestle.tasks.base_task.md - - cis_xlsx_to_oscal_catalog: api_reference/trestle.tasks.cis_xlsx_to_oscal_catalog.md - - csv_to_oscal_cd: api_reference/trestle.tasks.csv_to_oscal_cd.md - - ocp4_cis_profile_to_oscal_catalog: api_reference/trestle.tasks.ocp4_cis_profile_to_oscal_catalog.md - - ocp4_cis_profile_to_oscal_cd: api_reference/trestle.tasks.ocp4_cis_profile_to_oscal_cd.md - - oscal_catalog_to_csv: api_reference/trestle.tasks.oscal_catalog_to_csv.md - - oscal_profile_to_osco_profile: api_reference/trestle.tasks.oscal_profile_to_osco_profile.md - - osco_result_to_oscal_ar: api_reference/trestle.tasks.osco_result_to_oscal_ar.md - - tanium_result_to_oscal_ar: api_reference/trestle.tasks.tanium_result_to_oscal_ar.md - - transform: api_reference/trestle.tasks.transform.md - - xccdf_result_to_oscal_ar: api_reference/trestle.tasks.xccdf_result_to_oscal_ar.md - - xlsx_helper: api_reference/trestle.tasks.xlsx_helper.md - - xlsx_to_oscal_cd: api_reference/trestle.tasks.xlsx_to_oscal_cd.md - - xlsx_to_oscal_profile: api_reference/trestle.tasks.xlsx_to_oscal_profile.md - - transforms: - - implementations: - - osco: api_reference/trestle.transforms.implementations.osco.md - - tanium: api_reference/trestle.transforms.implementations.tanium.md - - xccdf: api_reference/trestle.transforms.implementations.xccdf.md - - results: api_reference/trestle.transforms.results.md - - transformer_factory: api_reference/trestle.transforms.transformer_factory.md - - transformer_helper: api_reference/trestle.transforms.transformer_helper.md - - transformer_singleton: api_reference/trestle.transforms.transformer_singleton.md plugins: +- awesome-pages +# warning don't use `macros` - yet - search +- social +- autorefs +- git-revision-date-localized +- htmlproofer: + enabled: true + validate_rendered_template: false + validate_external_urls: true + raise_error_after_finish: false + raise_error_excludes: + # This is to remove some false positives for links which work. + # Anchors are validated again by core mkdocs + 404: ['#trestle.*'] - mkdocstrings: + default_handler: python handlers: python: options: + show_inheritance_diagram: true + inherited_members: false group_by_category: true show_category_heading: true show_if_no_docstring: true @@ -206,8 +53,14 @@ plugins: - '!^__json' - '!^__config__' new_path_syntax: true - watch: - - trestle +- minify: + minify_html: true + minify_js: false + minify_css: true + css_files: + - css/mkdocstrings.css + htmlmin_opts: + remove_comments: true repo_name: oscal-compass/compliance-trestle repo_url: https://github.com/oscal-compass/compliance-trestle site_description: Documentation for compliance-trestle package. @@ -220,5 +73,14 @@ theme: name: material palette: accent: purple - primary: teal + primary: black scheme: slate + time_format: "%Y-%m-%d %H:%M:%S" # The format used to display the time + meta_time_format: "%Y-%m-%d %H:%M:%S" + #logo: "../images/compliance-trestle-800x800-transparent.png" # Update when have a single color svg + favicon: assets/favicon.ico +validation: + omitted_files: warn + absolute_links: warn # Or 'relative_to_docs' - new in MkDocs 1.6 + unrecognized_links: warn + anchors: warn # New in MkDocs 1.6 diff --git a/pyproject.toml b/pyproject.toml index 9d892bf01..ab184b9bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,10 @@ line-length = 500 line_length = 500 [tool.semantic_release] -build_command = "python setup.py sdist bdist_wheel" +build_command = """ + python -m pip install -e .[dev] --upgrade --upgrade-strategy eager -- + python setup.py sdist bdist_wheel +""" version_variables = ["trestle/__init__.py:__version__"] commit_author = "semantic-release " diff --git a/scripts/flatten_schema.py b/scripts/flatten_schema.py index 0e1df3a29..cf155cf9a 100644 --- a/scripts/flatten_schema.py +++ b/scripts/flatten_schema.py @@ -56,7 +56,7 @@ def _replace_ref(self, d, ref_set): def _replace_refs(self, obj, ref_set): """Given an object recurse into it replacing any found ref: defs with what is in def_list.""" - if type(obj) == dict: + if isinstance(obj, dict): # first check if it is a simple $ref line and replace it directly if len(obj.items()) == 1 and obj.get(self._ref_str, None) is not None: return self._replace_ref(obj, ref_set) @@ -71,9 +71,9 @@ def _replace_refs(self, obj, ref_set): if changed: dirty = True return new_dict, ref_set, dirty - elif type(obj) == str: + elif isinstance(obj, str): return obj, ref_set, False - elif type(obj) == list: + elif isinstance(obj, list): n_list = len(obj) changed = False dirty = False @@ -82,7 +82,7 @@ def _replace_refs(self, obj, ref_set): if changed: dirty = True return obj, ref_set, dirty - elif type(obj) == tuple: + elif isinstance(obj, tuple): new_val, ref_set, changed = self._replace_refs(obj[1], ref_set) return (obj[0], new_val), ref_set, changed if hasattr(obj, '__iter__'): diff --git a/scripts/oscal_normalize.py b/scripts/oscal_normalize.py index 73a37b295..5b2027936 100644 --- a/scripts/oscal_normalize.py +++ b/scripts/oscal_normalize.py @@ -235,7 +235,7 @@ def add_ref_pattern(self, p, line): new_refs = p.findall(line) if new_refs: for r in new_refs: - if type(r) == tuple: + if isinstance(r, tuple): for s in r: self.add_ref_if_good(s) else: diff --git a/scripts/schema_integrity.py b/scripts/schema_integrity.py index fc004e443..cc1ed60f6 100644 --- a/scripts/schema_integrity.py +++ b/scripts/schema_integrity.py @@ -77,11 +77,11 @@ def recursive_ref(self, ref_key: str, dict_of_interest: Dict[str, Any]) -> List[ for key, value in dict_of_interest.items(): if key == ref_key: returner.append(value) - elif type(value) == dict: + elif isinstance(value, dict): returner = returner + self.recursive_ref(ref_key, value) - elif type(value) == list: + elif isinstance(value, list): for item in value: - if type(item) == dict: + if isinstance(item, dict): returner = returner + self.recursive_ref(ref_key, item) elif key == ref_key: returner.append(value) diff --git a/scripts/website_automation.py b/scripts/website_automation.py index 703366b3f..41a5e36c8 100644 --- a/scripts/website_automation.py +++ b/scripts/website_automation.py @@ -27,33 +27,18 @@ import shutil from typing import Any, Dict, List -from ruamel.yaml import YAML - - -def update_mkdocs_meta(path: pathlib.Path, module_list: List[Any]) -> None: - """Update the mkdocs.yml structure file to represent the latest trestle modules.""" - yaml = YAML() - fh_read = path.open('r', encoding='utf8') - yaml_structure = yaml.load(fh_read) - fh_read.close() - nav = yaml_structure['nav'] - for index in range(len(nav)): - if 'Reference' in nav[index].keys(): - nav[index]['Reference'] = [] - nav[index]['Reference'].append({'Integrating with IBM SCC': 'reference/third-party-result-schema-SCC.md'}) - nav[index]['Reference'].append({'trestle API reference': module_list}) - - yaml_structure['nav'] = nav - fh_write = path.open('w', encoding='utf8') - yaml.dump(yaml_structure, fh_write) - fh_write.close() - def write_module_doc_metafile(dump_location: pathlib.Path, module_name: str) -> None: """Create a markdown file which allows mkdocstrings to index an individual module.""" - write_file = dump_location / (module_name + '.md') + write_file = dump_location / (module_name.replace('.', '/') + '.md') + write_file.parent.mkdir(parents=True, exist_ok=True) fh = write_file.open('w', encoding='utf8') - fh.write(f'::: {module_name}\n') + # yaml header + fh.write('---\n') + fh.write(f'title: {module_name}\n') + fh.write(f'description: Documentation for {module_name} module\n') + fh.write('---\n\n') + fh.write(f'::: {module_name}\n') # noqa: E231 fh.write('handler: python\n') fh.close() @@ -76,7 +61,7 @@ def create_module_markdowns(base_path: pathlib.Path, base_module: str, dump_loca if len(struct) > 0: module_arr.append({path.stem: struct}) elif path.suffix == '.py' and path.stem[0] != '_': - struct = dump_location.stem + '/' + module_full_name + '.md' + struct = dump_location.stem + '/' + module_full_name.replace('.', '/') + '.md' write_module_doc_metafile(dump_location, module_full_name) module_arr.append({path.stem: struct}) module_arr.sort(key=get_key) @@ -106,10 +91,9 @@ def cleanup_directory(dump_location: pathlib.Path): if __name__ == '__main__': # Setup structure automatically for mkdocstrings - api_ref_location = pathlib.Path('docs/api_reference') + api_ref_location = pathlib.Path('docs/reference/API') cleanup_directory(api_ref_location) structer = create_module_markdowns(pathlib.Path('trestle'), 'trestle', api_ref_location) - update_mkdocs_meta(pathlib.Path('mkdocs.yml'), structer) # Ensure single source of truth for license file md_txt(pathlib.Path('LICENSE'), pathlib.Path('docs/license.md')) md_txt(pathlib.Path('DCO1.1.txt'), pathlib.Path('docs/contributing/DCO.md')) diff --git a/setup.cfg b/setup.cfg index 116f70029..d965db771 100644 --- a/setup.cfg +++ b/setup.cfg @@ -79,12 +79,18 @@ dev = types-requests types-setuptools # # Docs website - mkdocs==1.5.0 - mkdocstrings[python-legacy]==0.19.0 + mkdocs>=1.6.0 + mkdocs-awesome-pages-plugin + mkdocstrings[python]>=0.25.2 + mkdocs-htmlproofer-plugin mkdocs-material markdown-include + mkdocs-minify-plugin + mkdocs-git-revision-date-localized-plugin pymdown-extensions livereload + pillow + cairosvg ## Constrain system pylint # Checking repo after docs generation. diff --git a/tests/conftest.py b/tests/conftest.py index d4053b29d..21704a0f8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -32,8 +32,10 @@ from trestle.cli import Trestle from trestle.common.err import TrestleError from trestle.oscal import catalog as cat +from trestle.oscal.common import Party from trestle.oscal.component import ComponentDefinition, DefinedComponent from trestle.oscal.profile import Profile +from trestle.oscal.ssp import SystemSecurityPlan TEST_CONFIG: dict = {} @@ -190,6 +192,20 @@ def sample_catalog_subgroups(): return catalog_obj +@pytest.fixture(scope='function') +def sample_party() -> Party: + """Return a valid Party object.""" + return gens.generate_sample_model(Party, True, 3) + + +@pytest.fixture(scope='function') +def sample_system_security_plan(sample_party: Party) -> SystemSecurityPlan: + """Return a valid SSP object with some contents.""" + ssp: SystemSecurityPlan = gens.generate_sample_model(SystemSecurityPlan, True, 2) + ssp.metadata.parties = [gens.generate_sample_model(Party, True, 3), sample_party] + return ssp + + @pytest.fixture(scope='function') def sample_component_definition(): """Return a valid ComponentDefinition object with some contents.""" diff --git a/tests/data/csv/rule-name-overlap.csv b/tests/data/csv/rule-name-overlap.csv new file mode 100644 index 000000000..d1570e0af --- /dev/null +++ b/tests/data/csv/rule-name-overlap.csv @@ -0,0 +1,7 @@ +$$Component_Title,$$Component_Description,$$Component_Type,$$Rule_Id,$$Rule_Description,Check_Id,Check_Description,$$Namespace,Target_Component,$$Control_Id_List,$$Profile_Source,$$Profile_Description +OSCO,OSCO,validation,RULE-1.1,RULE1.1,Check.1,Check.1,http://oscal-compass/compliance-trestle/schemas/oscal/cd,Target-A,,, +OSCO,OSCO,validation,RULE-1.1,RULE1.1,Check.2,Check.2,http://oscal-compass/compliance-trestle/schemas/oscal/cd,Target-A,,, +OSCO,OSCO,validation,RULE-1.1,RULE1.1,Check.3,Check.3,http://oscal-compass/compliance-trestle/schemas/oscal/cd,Target-A,,, +OSCO,OSCO,validation,RULE-1.1,RULE1.1,Check.1,Check.1,http://oscal-compass/compliance-trestle/schemas/oscal/cd,Target-B,,, +OSCO,OSCO,validation,RULE-1.1,RULE1.1,Check.3,Check.2,http://oscal-compass/compliance-trestle/schemas/oscal/cd,Target-B,,, +OSCO,OSCO,validation,RULE-1.1,RULE1.1,Check.2,Check.3,http://oscal-compass/compliance-trestle/schemas/oscal/cd,Target-B,,, diff --git a/tests/data/json/comp_def_c.json b/tests/data/json/comp_def_c.json new file mode 100644 index 000000000..f56d434d1 --- /dev/null +++ b/tests/data/json/comp_def_c.json @@ -0,0 +1,121 @@ +{ + "component-definition": { + "uuid": "2652b814-2a6b-4b6d-a0ae-8bc7a007209f", + "metadata": { + "title": "comp def c", + "last-modified": "2021-07-19T14:03:03+00:00", + "version": "0.21.0", + "oscal-version": "1.0.2", + "roles": [ + { + "id": "prepared-by", + "title": "Indicates the organization that created this content." + }, + { + "id": "prepared-for", + "title": "Indicates the organization for which this content was created.." + }, + { + "id": "content-approver", + "title": "Indicates the organization responsible for all content represented in the \"document\"." + } + ], + "parties": [ + { + "uuid": "ce1f379a-fcdd-485a-a7b7-6f02c0763dd2", + "type": "organization", + "name": "ACME", + "remarks": "ACME company" + }, + { + "uuid": "481856b6-16e4-4993-a3ed-2fb242ce235b", + "type": "organization", + "name": "Customer", + "remarks": "Customer for the Component Definition" + }, + { + "uuid": "2dc8b17f-daca-44a1-8a1d-c290120ea5e2", + "type": "organization", + "name": "ISV", + "remarks": "ISV for the Component Definition" + } + ], + "responsible-parties": [ + { + "role-id": "prepared-by", + "party-uuids": [ + "ce1f379a-fcdd-485a-a7b7-6f02c0763dd2" + ] + }, + { + "role-id": "prepared-for", + "party-uuids": [ + "481856b6-16e4-4993-a3ed-2fb242ce235b", + "2dc8b17f-daca-44a1-8a1d-c290120ea5e2" + ] + }, + { + "role-id": "content-approver", + "party-uuids": [ + "ce1f379a-fcdd-485a-a7b7-6f02c0763dd2" + ] + } + ] + }, + "components": [ + { + "uuid": "8220b305-0271-45f9-8a21-40ab6f197f70", + "type": "Service", + "title": "comp_cc", + "description": "comp cc", + "control-implementations": [ + { + "uuid": "76e89b67-3d6b-463d-90df-ec56a46c6069", + "source": "trestle://profiles/comp_prof_aa/profile.json", + "description": "trestle comp prof cc", + "implemented-requirements": [ + { + "uuid": "ca5ea4c5-ba51-4b1d-932a-5606891b7500", + "control-id": "ac-1", + "description": "imp req prose for ac-1 from comp cc", + "responsible-roles": [ + { + "role-id": "prepared-by", + "party-uuids": [ + "ce1f379a-fcdd-485a-a7b7-6f02c0763dd2" + ] + }, + { + "role-id": "prepared-for", + "party-uuids": [ + "481856b6-16e4-4993-a3ed-2fb242ce235b", + "2dc8b17f-daca-44a1-8a1d-c290120ea5e2" + ] + }, + { + "role-id": "content-approver", + "party-uuids": [ + "ce1f379a-fcdd-485a-a7b7-6f02c0763dd2" + ] + } + ], + "statements": [ + { + "statement-id": "ac-1_smt.a", + "uuid": "2652b814-2a6b-4b6d-a0ae-8bc7a0072200", + "description": "statement prose for part a. from comp cc" + } + ] + }, + { + "uuid": "ca5ea4c5-ba51-4b1d-932a-5606891b7599", + "control-id": "ac-3", + "description": "imp req prose for ac-3 from comp cc" + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/tests/data/json/profile_aggregation.json b/tests/data/json/profile_aggregation.json new file mode 100644 index 000000000..f6e6459a4 --- /dev/null +++ b/tests/data/json/profile_aggregation.json @@ -0,0 +1,106 @@ +{ + "profile": { + "uuid": "83be30e4-6c88-40e0-9927-286ff0e43d59", + "metadata": { + "title": "SI-7 profile", + "last-modified": "2024-06-24T19:35:43.973109+00:00", + "version": "0.0.1", + "oscal-version": "1.1.2" + }, + "imports": [ + { + "href": "https://raw.githubusercontent.com/usnistgov/oscal-content/main/nist.gov/SP800-53/rev5/json/NIST_SP-800-53_rev5_catalog.json", + "include-controls": [ + { + "with-ids": [ + "si-7" + ] + } + ] + } + ], + "modify": { + "set-parameters": [ + { + "param-id": "si-07_odp.01", + "props": [ + { + "name": "param-value-origin", + "value": "OCISO" + } + ], + "values": [ + "software" + ] + }, + { + "param-id": "si-07_odp.02", + "props": [ + { + "name": "param-value-origin", + "value": "OCISO" + } + ], + "values": [ + "firmware" + ] + }, + { + "param-id": "si-07_odp.03", + "props": [ + { + "name": "param-value-origin", + "value": "OCISO" + } + ], + "values": [ + "information" + ] + }, + { + "param-id": "si-07_odp.04", + "props": [ + { + "name": "param-value-origin", + "value": "OCISO" + } + ], + "values": [ + "notify the System Owner, ISSO, ISSM, and the Incident Response team" + ] + }, + { + "param-id": "si-07_odp.05", + "props": [ + { + "name": "param-value-origin", + "value": "OCISO" + } + ], + "values": [ + "notify the System Owner, ISSO, ISSM, and the Incident Response team" + ] + }, + { + "param-id": "si-07_odp.06", + "props": [ + { + "name": "param-value-origin", + "value": "OCISO" + } + ], + "values": [ + "notify the System Owner, ISSO, ISSM, and the Incident Response team" + ] + }, + { + "param-id": "si-7_prm_1" + }, + { + "param-id": "si-7_prm_2" + } + ], + "alters": [] + } + } +} diff --git a/tests/data/tasks/csv-to-oscal-cd/test-csv-to-oscal-cd-rule-name-overlap.config b/tests/data/tasks/csv-to-oscal-cd/test-csv-to-oscal-cd-rule-name-overlap.config new file mode 100644 index 000000000..b3604de03 --- /dev/null +++ b/tests/data/tasks/csv-to-oscal-cd/test-csv-to-oscal-cd-rule-name-overlap.config @@ -0,0 +1,7 @@ +[task.csv-to-oscal-cd] + +title = Component definition for validation with rule overlaps +version = V1.1 +csv-file = tests/data/csv/rule-name-overlap.csv +output-dir = tmp +output-overwrite = true diff --git a/tests/trestle/core/base_model_test.py b/tests/trestle/core/base_model_test.py index bc1ff567c..61581bb5c 100644 --- a/tests/trestle/core/base_model_test.py +++ b/tests/trestle/core/base_model_test.py @@ -86,7 +86,7 @@ def test_is_oscal_base() -> None: """Test that the typing information is as expected.""" catalog = simple_catalog() - assert (isinstance(catalog, ospydantic.OscalBaseModel)) + assert isinstance(catalog, ospydantic.OscalBaseModel) def test_no_timezone_exception() -> None: @@ -104,7 +104,7 @@ def test_with_timezone() -> None: popo_json = json.loads(jsoned_catalog) time = popo_json['metadata']['last-modified'] - assert (type(time) == str) + assert isinstance(time, str) assert ('Z' in time or '+' in time or '-' in time) diff --git a/tests/trestle/core/commands/author/component_test.py b/tests/trestle/core/commands/author/component_test.py index 508b14f71..0160371c4 100644 --- a/tests/trestle/core/commands/author/component_test.py +++ b/tests/trestle/core/commands/author/component_test.py @@ -202,3 +202,64 @@ def test_component_generate_more_than_one_param(tmp_trestle_dir: pathlib.Path, m # now assemble component generated assemble_cmd = f'trestle author component-assemble -m {md_path} -n {comp_name} -o {assem_name}' test_utils.execute_command_and_assert(assemble_cmd, CmdReturnCodes.SUCCESS.value, monkeypatch) + + +def test_component_workflow_no_rules(tmp_trestle_dir: pathlib.Path, monkeypatch: MonkeyPatch) -> None: + """Test component generate and assemble with no rules set.""" + comp_name = test_utils.setup_component_generate(tmp_trestle_dir, 'comp_def_c') + ac1_path = tmp_trestle_dir / 'md_comp/comp_cc/comp_prof_aa/ac/ac-1.md' + + orig_component, _ = model_utils.ModelUtils.load_model_for_class( + tmp_trestle_dir, comp_name, comp.ComponentDefinition + ) + + generate_cmd = f'trestle author component-generate -n {comp_name} -o {md_path}' + test_utils.execute_command_and_assert(generate_cmd, CmdReturnCodes.SUCCESS.value, monkeypatch) + + # Check that the example md file looks correct + _, tree = MarkdownProcessor().process_markdown(ac1_path) + + imp_req_md = """## What is the solution and how is it implemented? + + + + + +imp req prose for ac-1 from comp cc + +### Implementation Status: planned + +______________________________________________________________________ +""" # noqa E501 + + node = tree.get_node_for_key('## What is the solution and how is it implemented?') + assert node.content.raw_text == imp_req_md + + part_a_md = """## Implementation for part a. + +statement prose for part a. from comp cc + +### Implementation Status: planned + +______________________________________________________________________""" + + node = tree.get_node_for_key('## Implementation for part a.') + assert node.content.raw_text == part_a_md + + test_utils.substitute_text_in_file( + ac1_path, '### Implementation Status: planned', f'### Implementation Status: {const.STATUS_IMPLEMENTED}' + ) + # Check that the changes make it into the JSON + assem_name = 'assem_comp' + assemble_cmd = f'trestle author component-assemble -m {md_path} -n {comp_name} -o {assem_name}' + test_utils.execute_command_and_assert(assemble_cmd, CmdReturnCodes.SUCCESS.value, monkeypatch) + assem_component, _ = model_utils.ModelUtils.load_model_for_class( + tmp_trestle_dir, assem_name, comp.ComponentDefinition + ) + + # Check the ac-1 implementation status and that the model changed + assert not model_utils.ModelUtils.models_are_equivalent(orig_component, assem_component) # type: ignore + imp_reqs = assem_component.components[0].control_implementations[0].implemented_requirements # type: ignore + imp_req = next((i_req for i_req in imp_reqs if i_req.control_id == 'ac-1'), None) + assert imp_req.description == 'imp req prose for ac-1 from comp cc' + assert ControlInterface.get_status_from_props(imp_req).state == const.STATUS_IMPLEMENTED # type: ignore diff --git a/tests/trestle/core/commands/author/ssp_test.py b/tests/trestle/core/commands/author/ssp_test.py index b4fe2c5e3..ec4df8d7e 100644 --- a/tests/trestle/core/commands/author/ssp_test.py +++ b/tests/trestle/core/commands/author/ssp_test.py @@ -1303,3 +1303,75 @@ def test_ssp_generate_no_cds_include_all_parts(tmp_trestle_dir: pathlib.Path) -> node = tree.get_node_for_key('## Implementation for part a.') assert node.content.raw_text == part_a_text_no_comp + + +def test_ssp_generate_aggregates_no_cds(tmp_trestle_dir: pathlib.Path) -> None: + """Test the ssp generator with no comp defs does aggregate values from aggregated parameters.""" + args, _ = setup_for_ssp(tmp_trestle_dir, 'profile_aggregation', ssp_name) + + args.compdefs = None + ssp_cmd = SSPGenerate() + assert ssp_cmd._run(args) == 0 + md_dir = tmp_trestle_dir / ssp_name + si_7 = md_dir / 'si-7.md' + assert si_7.exists() + + md_api = MarkdownAPI() + header, tree = md_api.processor.process_markdown(si_7) + si_7_odp_01 = header['x-trestle-set-params']['si-07_odp.01'] + si_7_odp_01['ssp-values'] = ['changed value in the ssp markdown'] + + md_api.write_markdown_with_header(si_7, header, tree.content.raw_text) + + # now assemble the edited controls into json ssp + ssp_assemble = SSPAssemble() + assemble_args = argparse.Namespace( + trestle_root=tmp_trestle_dir, + markdown=ssp_name, + output=ssp_name, + verbose=0, + regenerate=False, + version='', + name=None, + compdefs=None + ) + assert ssp_assemble._run(assemble_args) == 0 + + # Verify the correct information is in the assembled ssp + ssp, _ = ModelUtils.load_model_for_class(tmp_trestle_dir, ssp_name, ossp.SystemSecurityPlan, FileContentType.JSON) + imp_reqs = ssp.control_implementation.implemented_requirements + si_7_imp_req = next((i_req for i_req in imp_reqs if i_req.control_id == 'si-7'), None) + si_07_odp_01 = next((param for param in si_7_imp_req.set_parameters if param.param_id == 'si-07_odp.01'), None) + changed_value_in_ssp = next( + (val for val in si_07_odp_01.values if val == 'changed value in the ssp markdown'), None + ) + assert changed_value_in_ssp is not None + + # regenerate the SSP again + ssp_cmd = SSPGenerate() + assert ssp_cmd._run(args) == 0 + md_dir = tmp_trestle_dir / ssp_name + si_7 = md_dir / 'si-7.md' + assert si_7.exists() + + md_api = MarkdownAPI() + header, tree = md_api.processor.process_markdown(si_7) + si_7_odp_01 = header['x-trestle-set-params']['si-07_odp.01'] + assert 'changed value in the ssp markdown' in si_7_odp_01['ssp-values'] + + +def test_ssp_generate_aggregates_no_param_value_orig(tmp_trestle_dir: pathlib.Path) -> None: + """Test the ssp generator aggregate parameters have no parame-value-origin.""" + args, _ = setup_for_ssp(tmp_trestle_dir, 'profile_aggregation', ssp_name) + + args.compdefs = None + ssp_cmd = SSPGenerate() + assert ssp_cmd._run(args) == 0 + md_dir = tmp_trestle_dir / ssp_name + si_7 = md_dir / 'si-7.md' + assert si_7.exists() + + md_api = MarkdownAPI() + header, _ = md_api.processor.process_markdown(si_7) + si_7_prm_1 = header['x-trestle-set-params']['si-7_prm_1'] + assert const.PARAM_VALUE_ORIGIN not in si_7_prm_1.keys() diff --git a/tests/trestle/core/generator_test.py b/tests/trestle/core/generator_test.py index 5ebe2f4e8..e50b08540 100644 --- a/tests/trestle/core/generator_test.py +++ b/tests/trestle/core/generator_test.py @@ -154,7 +154,7 @@ def test_gen_control() -> None: def test_ensure_optional_exists() -> None: """Explicit test to ensure that optional variables are populated.""" my_catalog = gens.generate_sample_model(catalog.Catalog, include_optional=True, depth=-1) - assert type(my_catalog.controls[0]) == catalog.Control + assert isinstance(my_catalog.controls[0], catalog.Control) def test_gen_party() -> None: diff --git a/tests/trestle/core/jinja/filters_test.py b/tests/trestle/core/jinja/filters_test.py new file mode 100644 index 000000000..24848bf24 --- /dev/null +++ b/tests/trestle/core/jinja/filters_test.py @@ -0,0 +1,69 @@ +# -*- mode:python; coding:utf-8 -*- + +# Copyright (c) 2024 The OSCAL Compass Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Tests for trestle custom jinja filters functionality.""" + +from typing import Any, List, Optional + +import pytest + +from trestle.core.jinja.filters import (diagram_href, first_or_none, get_party, parties_for_role) +from trestle.oscal.common import Link, Party, ResponsibleParty +from trestle.oscal.ssp import Diagram, SystemSecurityPlan + + +@pytest.mark.parametrize( + 'links,expected', + [ + ( + [ + Link(rel='other', href='./path/to/local/thing'), + Link(rel='diagram', href='https://host.name/path/to/diagram.png') + ], + 'https://host.name/path/to/diagram.png' + ), ([Link(rel='other', href='./path/to/local/file')], ''), ([], ''), (None, '') + ] +) +def test_diagram_href(links: Optional[List[Link]], expected: str) -> None: + """Test retrieving the link href for rel='diagram'.""" + diagram = Diagram(uuid='26c1c7df-fb67-45ba-b60f-35d8b5c1d1dc', links=links) + assert diagram_href(diagram) == expected + + +@pytest.mark.parametrize('actual,expected', [[['ok'], 'ok'], ([], None), (None, None)]) +def test_first_or_none(actual: Optional[List[Any]], expected: Optional[Any]) -> None: + """Test behavior of retrieving the first element or None for empty or missing list.""" + assert first_or_none(actual) == expected + + +def test_get_party(sample_system_security_plan: SystemSecurityPlan, sample_party: Party) -> None: + """Test behavior of retrieving a ssp.metadata.parties entry by UUID.""" + assert get_party(sample_party.uuid, ssp=sample_system_security_plan) == sample_party + + +def test_parties_for_role(sample_system_security_plan: SystemSecurityPlan, sample_party: Party) -> None: + """Test behavior of retrieving all parties for a given role-id.""" + sample_system_security_plan.metadata.responsible_parties = [ + ResponsibleParty(role_id='pytest-tester', party_uuids=[sample_party.uuid]) + ] + result = list( + parties_for_role( + sample_system_security_plan.metadata.responsible_parties, + role_id='pytest-tester', + ssp=sample_system_security_plan + ) + ) + assert len(result) == 1 + assert result[0] == sample_party diff --git a/tests/trestle/core/jinja_test.py b/tests/trestle/core/jinja/tags_test.py similarity index 98% rename from tests/trestle/core/jinja_test.py rename to tests/trestle/core/jinja/tags_test.py index 09a888ed4..0885ad047 100644 --- a/tests/trestle/core/jinja_test.py +++ b/tests/trestle/core/jinja/tags_test.py @@ -22,7 +22,7 @@ import pytest -import trestle.core.jinja as tres_jinja +import trestle.core.jinja.tags as tres_jinja from trestle.core.markdown import markdown_const JINJA_MD = 'jinja_markdown_include' diff --git a/tests/trestle/core/remote/cache_test.py b/tests/trestle/core/remote/cache_test.py index 51dbfe99a..1c7fdac39 100644 --- a/tests/trestle/core/remote/cache_test.py +++ b/tests/trestle/core/remote/cache_test.py @@ -276,13 +276,13 @@ def test_fetcher_factory(tmp_trestle_dir: pathlib.Path, monkeypatch: MonkeyPatch as_file_uri('user/oscal_file.json'), as_file_uri('../user/oscal_file.json')]: fetcher = cache.FetcherFactory.get_fetcher(tmp_trestle_dir, uri) - assert type(fetcher) == cache.LocalFetcher + assert isinstance(fetcher, cache.LocalFetcher) # paths with drive letter for uri in ['C:\\Users\\user\\this.json', 'C:/Users/user/this.json', 'C:file.json']: if file_utils.is_windows(): fetcher = cache.FetcherFactory.get_fetcher(tmp_trestle_dir, uri) - assert type(fetcher) == cache.LocalFetcher + assert isinstance(fetcher, cache.LocalFetcher) else: with pytest.raises(TrestleError): cache.FetcherFactory.get_fetcher(tmp_trestle_dir, uri) @@ -291,15 +291,15 @@ def test_fetcher_factory(tmp_trestle_dir: pathlib.Path, monkeypatch: MonkeyPatch monkeypatch.setenv('myusername', 'user123') monkeypatch.setenv('mypassword', 'somep4ss') fetcher = cache.FetcherFactory.get_fetcher(tmp_trestle_dir, https_uri) - assert type(fetcher) == cache.HTTPSFetcher + assert isinstance(fetcher, cache.HTTPSFetcher) sftp_uri = 'sftp://user@hostname:/path/to/file.json' fetcher = cache.FetcherFactory.get_fetcher(tmp_trestle_dir, sftp_uri) - assert type(fetcher) == cache.SFTPFetcher + assert isinstance(fetcher, cache.SFTPFetcher) sftp_uri = 'sftp://user@hostname:2000/path/to/file.json' fetcher = cache.FetcherFactory.get_fetcher(tmp_trestle_dir, sftp_uri) - assert type(fetcher) == cache.SFTPFetcher + assert isinstance(fetcher, cache.SFTPFetcher) def test_fetcher_expiration(tmp_trestle_dir: pathlib.Path) -> None: diff --git a/tests/trestle/tasks/cis_xlsx_to_oscal_catalog_test.py b/tests/trestle/tasks/cis_xlsx_to_oscal_catalog_test.py index 996a5ba25..cd1b1ec20 100644 --- a/tests/trestle/tasks/cis_xlsx_to_oscal_catalog_test.py +++ b/tests/trestle/tasks/cis_xlsx_to_oscal_catalog_test.py @@ -185,6 +185,57 @@ def test_cis_xlsx_to_oscal_catalog_unexpected_section(tmp_path: pathlib.Path): assert retval == TaskOutcome.FAILURE +def test_cis_xlsx_to_oscal_catalog_no_status(tmp_path: pathlib.Path): + """Test no column with name status.""" + folder = 'tests/data/tasks/cis-xlsx-to-oscal-catalog' + file_ = f'{folder}/CIS_RedHat_OpenShift_Container_Platform_Benchmark_v1.2.0-2.snippet.xlsx' + wb_hacked = load_workbook(file_) + sheet = wb_hacked['Combined Profiles'] + cell = sheet.cell(1, 5) + assert cell.value == 'status' + cell.value = 'X' + with mock.patch('trestle.tasks.cis_xlsx_to_oscal_catalog.load_workbook') as load_workbook_mock: + load_workbook_mock.return_value = wb_hacked + section = _get_section(tmp_path, ocp_config) + tgt = cis_xlsx_to_oscal_catalog.CisXlsxToOscalCatalog(section) + retval = tgt.execute() + assert retval == TaskOutcome.SUCCESS + + +def test_cis_xlsx_to_oscal_catalog_no_mitre(tmp_path: pathlib.Path): + """Test no column with name mitre.""" + folder = 'tests/data/tasks/cis-xlsx-to-oscal-catalog' + file_ = f'{folder}/CIS_RedHat_OpenShift_Container_Platform_Benchmark_v1.2.0-2.snippet.xlsx' + wb_hacked = load_workbook(file_) + sheet = wb_hacked['Combined Profiles'] + cell = sheet.cell(1, 20) + assert cell.value == 'MITRE ATT&CK Mappings' + cell.value = 'X' + with mock.patch('trestle.tasks.cis_xlsx_to_oscal_catalog.load_workbook') as load_workbook_mock: + load_workbook_mock.return_value = wb_hacked + section = _get_section(tmp_path, ocp_config) + tgt = cis_xlsx_to_oscal_catalog.CisXlsxToOscalCatalog(section) + retval = tgt.execute() + assert retval == TaskOutcome.SUCCESS + + +def test_cis_xlsx_to_oscal_catalog_no_v7_ig1(tmp_path: pathlib.Path): + """Test no column with name v7 IG1.""" + folder = 'tests/data/tasks/cis-xlsx-to-oscal-catalog' + file_ = f'{folder}/CIS_RedHat_OpenShift_Container_Platform_Benchmark_v1.2.0-2.snippet.xlsx' + wb_hacked = load_workbook(file_) + sheet = wb_hacked['Combined Profiles'] + cell = sheet.cell(1, 14) + assert cell.value == 'v7 IG1' + cell.value = 'Z' + with mock.patch('trestle.tasks.cis_xlsx_to_oscal_catalog.load_workbook') as load_workbook_mock: + load_workbook_mock.return_value = wb_hacked + section = _get_section(tmp_path, ocp_config) + tgt = cis_xlsx_to_oscal_catalog.CisXlsxToOscalCatalog(section) + retval = tgt.execute() + assert retval == TaskOutcome.SUCCESS + + def test_cis_xlsx_to_oscal_catalog_execute_rhel(tmp_path: pathlib.Path): """Test execute call - rhel.""" section = _get_section(tmp_path, rhel_config) diff --git a/tests/trestle/tasks/csv_to_oscal_cd_test.py b/tests/trestle/tasks/csv_to_oscal_cd_test.py index 3fd7d2800..88af85754 100644 --- a/tests/trestle/tasks/csv_to_oscal_cd_test.py +++ b/tests/trestle/tasks/csv_to_oscal_cd_test.py @@ -908,10 +908,10 @@ def test_execute_correct_rule_key(tmp_path: pathlib.Path) -> None: retval = tgt.execute() assert retval == TaskOutcome.SUCCESS # insure expected key exists - expected_key = (component_title, component_type, rule_id) + expected_key = (component_title, component_type, rule_id, None, None) assert expected_key in tgt._csv_mgr.get_rule_keys() # insure unexpected key does not exist - unexpected_key = (component_description, component_type, rule_id) + unexpected_key = (component_description, component_type, rule_id, None, None) assert unexpected_key not in tgt._csv_mgr.get_rule_keys() @@ -1345,6 +1345,32 @@ def test_execute_with_ignored_risk_properties(tmp_path: pathlib.Path) -> None: assert prop.name != 'Risk_Adjustment' +def test_execute_rule_name_overlap(tmp_path: pathlib.Path) -> None: + """Test execute rule name overlap.""" + _, section = _get_config_section_init(tmp_path, 'test-csv-to-oscal-cd-rule-name-overlap.config') + rows = _get_rows(section['csv-file']) + with mock.patch('trestle.tasks.csv_to_oscal_cd.csv.reader') as mock_csv_reader: + mock_csv_reader.return_value = rows + tgt = csv_to_oscal_cd.CsvToOscalComponentDefinition(section) + retval = tgt.execute() + assert retval == TaskOutcome.SUCCESS + # read component-definition + fp = pathlib.Path(tmp_path) / 'component-definition.json' + cd = ComponentDefinition.oscal_read(fp) + # spot check + component = cd.components[0] + assert component.type.lower() == 'validation' + assert len(component.props) == 20 + assert component.props[0].name == 'Rule_Id' + assert component.props[0].value == 'RULE-1.1' + assert component.props[3].name == 'Target_Component' + assert component.props[3].value == 'Target-A' + assert component.props[12].name == 'Rule_Id' + assert component.props[12].value == 'RULE-1.1' + assert component.props[15].name == 'Target_Component' + assert component.props[15].value == 'Target-B' + + def test_execute_add_user_property(tmp_path: pathlib.Path) -> None: """Test execute add user property.""" _, section = _get_config_section_init(tmp_path, 'test-csv-to-oscal-cd-bp.config') diff --git a/trestle/__init__.py b/trestle/__init__.py index 0de089d7f..8dd0257fd 100644 --- a/trestle/__init__.py +++ b/trestle/__init__.py @@ -23,4 +23,4 @@ opinionated approach to OSCAL adoption. """ -__version__ = '3.3.0' +__version__ = '3.5.0' diff --git a/trestle/cli.py b/trestle/cli.py index badb563f1..918b0e711 100644 --- a/trestle/cli.py +++ b/trestle/cli.py @@ -14,11 +14,8 @@ # limitations under the License. """Starting point for the Trestle CLI.""" -import importlib -import inspect import logging import pathlib -import pkgutil from trestle.common import const, log from trestle.core.commands.assemble import AssembleCmd @@ -38,6 +35,7 @@ from trestle.core.commands.task import TaskCmd from trestle.core.commands.validate import ValidateCmd from trestle.core.commands.version import VersionCmd +from trestle.core.plugins import discovered_plugins logger = logging.getLogger('trestle') @@ -63,29 +61,14 @@ class Trestle(CommandBase): VersionCmd ] - discovered_plugins = { - name: importlib.import_module(name) - for finder, - name, - ispkg in pkgutil.iter_modules() - if name.startswith('trestle_') - } - - logger.debug(discovered_plugins) # This block is uncovered as trestle cannot find plugins in it's unit tests - it is the base module. - for plugin, value in discovered_plugins.items(): # pragma: nocover - for _, module, _ in pkgutil.iter_modules([pathlib.Path(value.__path__[0], 'commands')]): - logger.debug(module) - command_module = importlib.import_module(f'{plugin}.commands.{module}') - clsmembers = inspect.getmembers(command_module, inspect.isclass) - logger.debug(clsmembers) - for _, cmd_cls in clsmembers: - # add commands (derived from CommandPlusDocs or CommandBase) to subcommands list - if issubclass(cmd_cls, CommandBase): - # don't add CommandPlusDocs or CommandBase - if cmd_cls is not CommandPlusDocs and cmd_cls is not CommandBase: - subcommands.append(cmd_cls) - logger.info(f'{cmd_cls} added to subcommands from plugin {plugin}') + for plugin, cmd_cls in discovered_plugins('commands'): # pragma: nocover + # add commands (derived from CommandPlusDocs or CommandBase) to subcommands list + if issubclass(cmd_cls, CommandBase): + # don't add CommandPlusDocs or CommandBase + if cmd_cls is not CommandPlusDocs and cmd_cls is not CommandBase: + subcommands.append(cmd_cls) + logger.info(f'{cmd_cls} added to subcommands from plugin {plugin}') def _init_arguments(self) -> None: self.add_argument('-v', '--verbose', help=const.DISPLAY_VERBOSE_OUTPUT, action='count', default=0) diff --git a/trestle/common/model_utils.py b/trestle/common/model_utils.py index d24991abd..47e901b7c 100644 --- a/trestle/common/model_utils.py +++ b/trestle/common/model_utils.py @@ -68,7 +68,7 @@ def load_distributed( Return a tuple of Model Type (e.g. class 'trestle.oscal.catalog.Catalog'), Model Alias (e.g. 'catalog.metadata') and Instance of the Model. If the model is decomposed/split/distributed, the instance of the model contains - the decomposed models loaded recursively. + the decomposed models loaded recursively. Note: This does not validate the model. You must either validate the model separately or use the load_validate @@ -171,7 +171,8 @@ def load_model_for_class( If you need to load an existing model but its content type may not be known, use this method. But the file content type should be specified if it is somehow known. - Note: This does not validate the model. If you want to validate the model use the load_validate utilities. + Note: + This does not validate the model. If you want to validate the model use the load_validate utilities. """ root_model_path = ModelUtils._root_path_for_top_level_model( trestle_root, model_name, model_class diff --git a/trestle/core/catalog/catalog_writer.py b/trestle/core/catalog/catalog_writer.py index 4f7065338..13cb1e584 100644 --- a/trestle/core/catalog/catalog_writer.py +++ b/trestle/core/catalog/catalog_writer.py @@ -165,9 +165,11 @@ def _construct_set_parameters_dict( # adds it to prof-param-value-origin if prof_param_value_origin != '' and prof_param_value_origin is not None: if context.purpose == ContextPurpose.PROFILE: - new_dict[const.PROFILE_PARAM_VALUE_ORIGIN] = prof_param_value_origin + if const.AGGREGATES not in [prop.name for prop in as_list(param.props)]: + new_dict[const.PROFILE_PARAM_VALUE_ORIGIN] = prof_param_value_origin else: - new_dict[const.PROFILE_PARAM_VALUE_ORIGIN] = const.REPLACE_ME_PLACEHOLDER + if const.AGGREGATES not in [prop.name for prop in as_list(param.props)]: + new_dict[const.PROFILE_PARAM_VALUE_ORIGIN] = const.REPLACE_ME_PLACEHOLDER # then insert the original, incoming values as values if param_id in control_param_dict: orig_param = control_param_dict[param_id] @@ -180,6 +182,8 @@ def _construct_set_parameters_dict( new_dict.pop(const.VALUES) if new_dict[const.GUIDELINES] is None: new_dict.pop(const.GUIDELINES) + if const.AGGREGATES in [prop.name for prop in as_list(orig_param.props)]: + new_dict.pop(const.PROFILE_PARAM_VALUE_ORIGIN) else: # if the profile doesnt change this param at all, show it in the header with values tmp_dict = ModelUtils.parameter_to_dict(param_dict, True) @@ -351,31 +355,24 @@ def _update_values(set_param: comp.SetParameter, control_param_dict) -> None: ci_set_params = ControlInterface.get_set_params_from_item(control_imp) for imp_req in as_list(control_imp.implemented_requirements): control_part_id_map = part_id_map.get(imp_req.control_id, {}) - control_rules, statement_rules, _ = ControlInterface.get_rule_list_for_imp_req(imp_req) - if control_rules or statement_rules: - if control_rules: - status = ControlInterface.get_status_from_props(imp_req) - comp_info = ComponentImpInfo(imp_req.description, control_rules, [], status) - self._catalog_interface.add_comp_info(imp_req.control_id, context.comp_name, '', comp_info) - set_params = copy.deepcopy(ci_set_params) - set_params.update(ControlInterface.get_set_params_from_item(imp_req)) - for set_param in set_params.values(): - self._catalog_interface.add_comp_set_param(imp_req.control_id, context.comp_name, set_param) - for statement in as_list(imp_req.statements): - rule_list, _ = ControlInterface.get_rule_list_for_item(statement) - if rule_list: - status = ControlInterface.get_status_from_props(statement) - if statement.statement_id not in control_part_id_map: - label = statement.statement_id - logger.warning( - f'No statement label found for statement id {label}. Defaulting to {label}.' - ) - else: - label = control_part_id_map[statement.statement_id] - comp_info = ComponentImpInfo(statement.description, rule_list, [], status) - self._catalog_interface.add_comp_info( - imp_req.control_id, context.comp_name, label, comp_info - ) + status = ControlInterface.get_status_from_props(imp_req) + control_rules, _ = ControlInterface.get_rule_list_for_item(imp_req) + comp_info = ComponentImpInfo(imp_req.description, control_rules, [], status) + self._catalog_interface.add_comp_info(imp_req.control_id, context.comp_name, '', comp_info) + set_params = copy.deepcopy(ci_set_params) + set_params.update(ControlInterface.get_set_params_from_item(imp_req)) + for set_param in set_params.values(): + self._catalog_interface.add_comp_set_param(imp_req.control_id, context.comp_name, set_param) + for statement in as_list(imp_req.statements): + status = ControlInterface.get_status_from_props(statement) + if statement.statement_id not in control_part_id_map: + label = statement.statement_id + logger.warning(f'No statement label found for statement id {label}. Defaulting to {label}.') + else: + label = control_part_id_map[statement.statement_id] + rule_list, _ = ControlInterface.get_rule_list_for_item(statement) + comp_info = ComponentImpInfo(statement.description, rule_list, [], status) + self._catalog_interface.add_comp_info(imp_req.control_id, context.comp_name, label, comp_info) catalog_merger = CatalogMerger(self._catalog_interface) diff --git a/trestle/core/commands/author/jinja.py b/trestle/core/commands/author/jinja.py index 56d01ca5e..55b2752a8 100644 --- a/trestle/core/commands/author/jinja.py +++ b/trestle/core/commands/author/jinja.py @@ -35,7 +35,7 @@ from trestle.core.commands.common.return_codes import CmdReturnCodes from trestle.core.control_interface import ControlInterface, ParameterRep from trestle.core.docs_control_writer import DocsControlWriter -from trestle.core.jinja import MDCleanInclude, MDDatestamp, MDSectionInclude +from trestle.core.jinja.ext import extensions from trestle.core.profile_resolver import ProfileResolver from trestle.core.ssp_io import SSPMarkdownWriter from trestle.oscal.profile import Profile @@ -191,10 +191,7 @@ def jinja_ify( """Run jinja over an input file with additional booleans.""" template_folder = pathlib.Path.cwd() jinja_env = Environment( - loader=FileSystemLoader(template_folder), - extensions=[MDSectionInclude, MDCleanInclude, MDDatestamp], - trim_blocks=True, - autoescape=True + loader=FileSystemLoader(template_folder), extensions=extensions(), trim_blocks=True, autoescape=True ) template = jinja_env.get_template(str(r_input_file)) # create boolean dict @@ -283,7 +280,7 @@ def jinja_multiple_md( jinja_env = Environment( loader=FileSystemLoader(template_folder), - extensions=[MDSectionInclude, MDCleanInclude, MDDatestamp], + extensions=extensions(), trim_blocks=True, autoescape=True ) @@ -315,7 +312,7 @@ def render_template(template: Template, lut: Dict[str, Any], template_folder: pa dict_loader = DictLoader({str(random_name): new_output}) jinja_env = Environment( loader=ChoiceLoader([dict_loader, FileSystemLoader(template_folder)]), - extensions=[MDCleanInclude, MDSectionInclude, MDDatestamp], + extensions=extensions(), autoescape=True, trim_blocks=True ) diff --git a/trestle/core/control_interface.py b/trestle/core/control_interface.py index cd7cc1622..1a2642d20 100644 --- a/trestle/core/control_interface.py +++ b/trestle/core/control_interface.py @@ -670,6 +670,24 @@ def _param_selection_as_str(param: common.Parameter, verbose: bool = False, brac return choices_str return '' + @staticmethod + def _param_as_aggregated_value( + param: common.Parameter, + param_dict: Dict[str, common.Parameter], + verbose: bool = False, + brackets: bool = False + ) -> str: + """Convert parameter aggregation to str.""" + # review is an aggregated parameter + if const.AGGREGATES in [prop.name for prop in as_list(param.props)]: + aggregated_values = '' + for prop in as_list(param.props): + if prop.value not in param_dict: + continue + aggregated_values += ', '.join(as_list(param_dict[prop.value].values)) + ', ' + return aggregated_values[:-2] + return '' + @staticmethod def _param_label_choices_as_str(param: common.Parameter, verbose: bool = False, brackets: bool = False) -> str: """Convert param label or choices to string, using choices if present.""" @@ -681,6 +699,7 @@ def _param_label_choices_as_str(param: common.Parameter, verbose: bool = False, @staticmethod def _param_values_assignment_str( param: common.Parameter, + param_dict: Dict[str, common.Parameter], value_assigned_prefix: Optional[str] = None, value_not_assigned_prefix: Optional[str] = None ) -> str: @@ -692,6 +711,10 @@ def _param_values_assignment_str( # otherwise use param selection if present if not param_str: param_str = ControlInterface._param_selection_as_str(param, True, False) + # otherwise use param aggregated values if present + if not param_str: + if any(as_list(param_dict[prop.value].values) for prop in as_list(param.props) if prop.value in param_dict): + param_str = ControlInterface._param_as_aggregated_value(param, param_dict, True, False) # finally use label and param_id as fallbacks if not param_str: param_str = param.label if param.label else param.id @@ -722,7 +745,8 @@ def param_to_str( brackets: bool = False, params_format: Optional[str] = None, value_assigned_prefix: Optional[str] = None, - value_not_assigned_prefix: Optional[str] = None + value_not_assigned_prefix: Optional[str] = None, + param_dict: Dict[str, common.Parameter] = None ) -> Optional[str]: """ Convert parameter to string based on best available representation. @@ -755,7 +779,7 @@ def param_to_str( param_str = '' elif param_rep == ParameterRep.ASSIGNMENT_FORM: param_str = ControlInterface._param_values_assignment_str( - param, value_assigned_prefix, value_not_assigned_prefix + param, param_dict, value_assigned_prefix, value_not_assigned_prefix ) if not param_str: param_str = '' @@ -854,11 +878,20 @@ def _replace_params( elif param_dict[param_ids[i]] is not None: param = param_dict[param_ids[i]] param_str = ControlInterface.param_to_str( - param, param_rep, False, False, params_format, value_assigned_prefix, value_not_assigned_prefix + param, + param_rep, + False, + False, + params_format, + value_assigned_prefix, + value_not_assigned_prefix, + param_dict ) text = text.replace(staches[i], param_str, 1).strip() if show_value_warnings and param_rep != ParameterRep.LABEL_OR_CHOICES and not param.values: - logger.warning(f'Parameter {param_id} has no values and was referenced by prose.') + # verifies the current parameter is not an aggregated parameter to throw a warning + if const.AGGREGATES not in [prop.name for prop in as_list(param.props)]: + logger.warning(f'Parameter {param_id} has no values and was referenced by prose.') elif show_value_warnings: logger.warning(f'Control prose references param {param_ids[i]} with no specified value.') # there may be staches remaining that we can't replace if not in param_dict diff --git a/trestle/core/control_reader.py b/trestle/core/control_reader.py index c1881c488..884910ac5 100644 --- a/trestle/core/control_reader.py +++ b/trestle/core/control_reader.py @@ -283,9 +283,6 @@ def read_implemented_requirement(control_file: pathlib.Path, imp_req.statements = [] comp_dict = md_comp_dict[comp_name] for label, comp_info in comp_dict.items(): - # only assemble responses with associated rules - if not comp_info.rules: - continue # if no label it applies to the imp_req itself rather than a statement if not label: imp_req.description = ControlReader._handle_empty_prose(comp_info.prose, control_id) diff --git a/trestle/core/control_writer.py b/trestle/core/control_writer.py index 481e23931..62703bd5f 100644 --- a/trestle/core/control_writer.py +++ b/trestle/core/control_writer.py @@ -129,7 +129,7 @@ def _insert_comp_info( level = 3 if context.purpose == ContextPurpose.COMPONENT else 4 if part_label in comp_info: info = comp_info[part_label] - if context.purpose in [ContextPurpose.COMPONENT, ContextPurpose.SSP] and not info.rules: + if context.purpose in [ContextPurpose.COMPONENT, ContextPurpose.SSP] and not self._include_component(info): return self._md_file.new_paragraph() if info.prose: @@ -266,23 +266,35 @@ def _add_implementation_response_prompts( self._insert_comp_info(part_label, dic, context) self._md_file.new_hr() + def _include_component(self, comp_info: ComponentImpInfo) -> bool: + """ + Check if a component has the required Markdown fields. + + Notes: This is a simple function to centralize logic to check + when a component meets the requirement to get written to Markdown. + """ + if comp_info.rules or comp_info.prose: + return True + return False + def _skip_part(self, context: ControlContext, part_label: str, comp_dict: CompDict) -> bool: """ Check if a part should be skipped based on rules and context. Notes: The default logic is to conditionally add control parts based - on whether the component has rules associated with that part. This can be + on whether the component has rules or existing prose associated with that part. This can be changed using the control context for SSP markdown. """ if context.purpose == ContextPurpose.SSP and context.include_all_parts: return False else: - no_applied_rules = True + skip_item = True for _, dic in comp_dict.items(): - if part_label in dic and dic[part_label].rules: - no_applied_rules = False - break - return no_applied_rules + if part_label in dic: + if self._include_component(dic[part_label]): + skip_item = False + break + return skip_item def _dump_subpart_infos(self, level: int, part: Dict[str, Any]) -> None: name = part['name'] diff --git a/trestle/core/jinja/__init__.py b/trestle/core/jinja/__init__.py new file mode 100644 index 000000000..348baa8dc --- /dev/null +++ b/trestle/core/jinja/__init__.py @@ -0,0 +1,16 @@ +# -*- mode:python; coding:utf-8 -*- + +# Copyright (c) 2024 The OSCAL Compass Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Trestle core.jinja functionality.""" diff --git a/trestle/core/jinja/base.py b/trestle/core/jinja/base.py new file mode 100644 index 000000000..5e851f149 --- /dev/null +++ b/trestle/core/jinja/base.py @@ -0,0 +1,48 @@ +# -*- mode:python; coding:utf-8 -*- + +# Copyright (c) 2024 The OSCAL Compass Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Trestle core.jinja base class.""" +from jinja2 import lexer, nodes +from jinja2.environment import Environment +from jinja2.ext import Extension + + +class TrestleJinjaExtension(Extension): + """Class to define common methods to be inherited from for use in trestle.""" + + max_tag_parse = 20 + + def __init__(self, environment: Environment) -> None: + """Ensure enviroment is set and carried into class vars.""" + super().__init__(environment) + + @staticmethod + def parse_expression(parser): + """Safely parse jinja expression.""" + # Licensed under MIT from: + # https://github.com/MoritzS/jinja2-django-tags/blob/master/jdj_tags/extensions.py#L424 + # Due to how the jinja2 parser works, it treats "foo" "bar" as a single + # string literal as it is the case in python. + # But the url tag in django supports multiple string arguments, e.g. + # "{% url 'my_view' 'arg1' 'arg2' %}". + # That's why we have to check if it's a string literal first. + token = parser.stream.current + if token.test(lexer.TOKEN_STRING): + expr = nodes.Const(token.value, lineno=token.lineno) + next(parser.stream) + else: + expr = parser.parse_expression(False) + + return expr diff --git a/trestle/core/jinja/ext.py b/trestle/core/jinja/ext.py new file mode 100644 index 000000000..09795b118 --- /dev/null +++ b/trestle/core/jinja/ext.py @@ -0,0 +1,40 @@ +# -*- mode:python; coding:utf-8 -*- + +# Copyright (c) 2024 The OSCAL Compass Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Trestle core.jinja extension loading functionality.""" +import functools +import logging +from typing import List + +from trestle.core.jinja import filters, tags +from trestle.core.jinja.base import Extension, TrestleJinjaExtension +from trestle.core.plugins import discovered_plugins + +logger = logging.getLogger(__name__) + + +@functools.cache +def extensions() -> List[Extension]: + """Return list of Jinja extensions packaged with compliance-trestle and included from plugins.""" + extensions = [tags.MDSectionInclude, tags.MDCleanInclude, tags.MDDatestamp, filters.JinjaSSPFilters] + # This block is uncovered as trestle cannot find plugins in it's unit tests - it is the base module. + for plugin, ext_cls in discovered_plugins('jinja_ext'): # pragma: nocover + # add extensions (derived from TrestleJinjaExtension) to extensions list + if issubclass(ext_cls, Extension): + # don't add Extension or TrestleJinjaExtension + if ext_cls is not TrestleJinjaExtension and ext_cls is not Extension: + extensions.append(ext_cls) + logger.info(f'{ext_cls} added to jinja extensions from plugin {plugin}') + return extensions diff --git a/trestle/core/jinja/filters.py b/trestle/core/jinja/filters.py new file mode 100644 index 000000000..574281999 --- /dev/null +++ b/trestle/core/jinja/filters.py @@ -0,0 +1,76 @@ +# -*- mode:python; coding:utf-8 -*- + +# Copyright (c) 2024 The OSCAL Compass Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Trestle utilities to customize jinja filters.""" +import logging +from typing import Any, Iterator, List, Optional + +from jinja2.environment import Environment + +from trestle.common.list_utils import as_list, get_default +from trestle.core.jinja.base import TrestleJinjaExtension +from trestle.oscal.common import Party, ResponsibleParty +from trestle.oscal.ssp import Diagram, SystemSecurityPlan + +logger = logging.getLogger(__name__) + + +def first_or_none(value: Optional[List[Any]]) -> Optional[Any]: + """Retrieve the first array entry, or None for lists that are None or empty.""" + return next(iter(as_list(value)), None) + + +def get_party(uuid: str, ssp: SystemSecurityPlan) -> Optional[Party]: + """Get the metadata.parties entry for this UUID.""" + return next((x for x in as_list(ssp.metadata.parties) if x.uuid == uuid), None) + + +def parties_for_role(responsible_parties: List[ResponsibleParty], role_id: str, + ssp: SystemSecurityPlan) -> Iterator[Party]: + """Get a list of parties from a list of responsible_parties and a given role_id.""" + logger.debug(f'Finding parties for role: {role_id}') + for responsible_party in as_list(responsible_parties): + if responsible_party.role_id == role_id: + logger.debug( + f'Found responsible party for role_id: {role_id} with {len(responsible_party.party_uuids)} parties' + ) + for uuid in responsible_party.party_uuids: + logger.debug(f'Looking for parties with uuid: {uuid}') + party = get_party(uuid, ssp) + if party: + yield party + + +def diagram_href(diagram: Optional[Diagram]) -> str: + """Retrieve the diagrams's link href.""" + if diagram: + return next((link.href for link in as_list(diagram.links) if link.rel == 'diagram'), '') + else: + return '' + + +class JinjaSSPFilters(TrestleJinjaExtension): + """Collection of useful OSCAL-specific filters.""" + + def __init__(self, environment: Environment) -> None: + """Initialize class and add filters.""" + super(JinjaSSPFilters, self).__init__(environment) + + environment.filters['as_list'] = as_list + environment.filters['get_default'] = get_default + environment.filters['first_or_none'] = first_or_none + environment.filters['get_party'] = get_party + environment.filters['parties_for_role'] = parties_for_role + environment.filters['diagram_href'] = diagram_href diff --git a/trestle/core/jinja.py b/trestle/core/jinja/tags.py similarity index 86% rename from trestle/core/jinja.py rename to trestle/core/jinja/tags.py index 3f97e219f..4ce11f725 100644 --- a/trestle/core/jinja.py +++ b/trestle/core/jinja/tags.py @@ -13,18 +13,18 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -"""Trestle utilities to customize .""" +"""Trestle utilities to customize jinja tags.""" import logging from datetime import date import frontmatter -from jinja2 import lexer, nodes +from jinja2 import lexer from jinja2.environment import Environment -from jinja2.ext import Extension from jinja2.parser import Parser from trestle.common import err +from trestle.core.jinja.base import TrestleJinjaExtension from trestle.core.markdown import docs_markdown_node, markdown_const logger = logging.getLogger(__name__) @@ -43,36 +43,6 @@ def adjust_heading_level(input_md: str, expected: int) -> str: return output_md -class TrestleJinjaExtension(Extension): - """Class to define common methods to be inherited from for use in trestle.""" - - # This - max_tag_parse = 20 - - def __init__(self, environment: Environment) -> None: - """Ensure enviroment is set and carried into class vars.""" - super().__init__(environment) - - @staticmethod - def parse_expression(parser): - """Safely parse jinja expression.""" - # Licensed under MIT from: - # https://github.com/MoritzS/jinja2-django-tags/blob/master/jdj_tags/extensions.py#L424 - # Due to how the jinja2 parser works, it treats "foo" "bar" as a single - # string literal as it is the case in python. - # But the url tag in django supports multiple string arguments, e.g. - # "{% url 'my_view' 'arg1' 'arg2' %}". - # That's why we have to check if it's a string literal first. - token = parser.stream.current - if token.test(lexer.TOKEN_STRING): - expr = nodes.Const(token.value, lineno=token.lineno) - next(parser.stream) - else: - expr = parser.parse_expression(False) - - return expr - - class MDSectionInclude(TrestleJinjaExtension): """Inject the parameter of the tag as the resulting content.""" diff --git a/trestle/core/markdown/markdown_validator.py b/trestle/core/markdown/markdown_validator.py index 3cd91cea5..35b8ce30c 100644 --- a/trestle/core/markdown/markdown_validator.py +++ b/trestle/core/markdown/markdown_validator.py @@ -181,8 +181,8 @@ def compare_keys( return False for key in template.keys(): if key in candidate.keys(): - if type(template[key]) == dict: - if type(candidate[key]) == dict: + if isinstance(template[key], dict): + if isinstance(candidate[key], dict): status = cls.compare_keys(template[key], candidate[key], ignore_fields) if not status: return status diff --git a/trestle/core/plugins.py b/trestle/core/plugins.py new file mode 100644 index 000000000..80d10b512 --- /dev/null +++ b/trestle/core/plugins.py @@ -0,0 +1,47 @@ +# -*- mode:python; coding:utf-8 -*- + +# Copyright (c) 2024 The OSCAL Compass Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +"""Plugin discovery code.""" + +import importlib +import inspect +import logging +import pathlib +import pkgutil +from typing import Any, Iterator, Tuple + +logger = logging.getLogger(__name__) + +_discovered_plugins = { + name: importlib.import_module(name) + for finder, + name, + ispkg in pkgutil.iter_modules() + if name.startswith('trestle_') +} + + +def discovered_plugins(search_module: str) -> Iterator[Tuple[str, Any]]: + """Yield discovered plugin classes within a given module name.""" + logger.debug(_discovered_plugins) + # This block is uncovered as trestle cannot find plugins in it's unit tests - it is the base module. + for plugin, value in _discovered_plugins.items(): # pragma: nocover + for _, module, _ in pkgutil.iter_modules([pathlib.Path(value.__path__[0], search_module)]): + logger.debug(module) + plugin_module = importlib.import_module(f'{plugin}.{search_module}.{module}') + clsmembers = inspect.getmembers(plugin_module, inspect.isclass) + logger.debug(clsmembers) + for _, plugin_cls in clsmembers: + yield (plugin, plugin_cls) diff --git a/trestle/tasks/cis_xlsx_to_oscal_catalog.py b/trestle/tasks/cis_xlsx_to_oscal_catalog.py index cc68c6ae2..3eff90df5 100644 --- a/trestle/tasks/cis_xlsx_to_oscal_catalog.py +++ b/trestle/tasks/cis_xlsx_to_oscal_catalog.py @@ -41,7 +41,7 @@ logger = logging.getLogger(__name__) -timestamp = datetime.datetime.utcnow().replace(microsecond=0).replace(tzinfo=datetime.timezone.utc).isoformat() +timestamp = datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0).isoformat() class XlsxHelper: @@ -78,7 +78,7 @@ def _translate(self, name: str) -> str: def _mapper(self) -> None: """Map columns heading names to column numbers.""" self._col_name_to_number = {} - cols = self._work_sheet.max_column + cols = self._work_sheet.max_column + 1 row = 1 for col in range(row, cols): cell = self._work_sheet.cell(row, col) @@ -281,19 +281,27 @@ def _create_property(self, name: str, value: str) -> Property: def _add_property(self, xlsx_helper: XlsxHelper, props: List[Property], row: int, key: str) -> None: """Add property.""" - name = self._get_normalized_name(key) - value = xlsx_helper.get(row, key) - if value: - props.append(self._create_property(name, value)) + try: + name = self._get_normalized_name(key) + value = xlsx_helper.get(row, key) + if value: + props.append(self._create_property(name, value)) + except KeyError as e: + text = f'key {e} not found.' + logger.debug(text) def _add_property_boolean(self, xlsx_helper: XlsxHelper, props: List[Property], row: int, key: str) -> None: """Add property.""" - name = self._get_normalized_name(key) - value = xlsx_helper.get(row, key) - if value: - props.append(self._create_property(name, 'True')) - else: - props.append(self._create_property(name, 'False')) + try: + name = self._get_normalized_name(key) + value = xlsx_helper.get(row, key) + if value: + props.append(self._create_property(name, 'True')) + else: + props.append(self._create_property(name, 'False')) + except KeyError as e: + text = f'key {e} not found.' + logger.debug(text) def _add_part(self, xlsx_helper: XlsxHelper, parts: List[Part], id_: str, row: int, key: str) -> None: """Add part.""" diff --git a/trestle/tasks/csv_to_oscal_cd.py b/trestle/tasks/csv_to_oscal_cd.py index a7343e02d..c8bf32dff 100644 --- a/trestle/tasks/csv_to_oscal_cd.py +++ b/trestle/tasks/csv_to_oscal_cd.py @@ -52,6 +52,7 @@ RULE_DESCRIPTION = 'Rule_Description' PROFILE_SOURCE = 'Profile_Source' PROFILE_DESCRIPTION = 'Profile_Description' +TARGET_COMPONENT = 'Target_Component' CHECK_ID = 'Check_Id' CHECK_DESCRIPTION = 'Check_Description' FETCHER_ID = 'Fetcher_Id' @@ -145,6 +146,26 @@ def row_property_builder(row: int, name: str, value, ns: str, class_: str, remar return prop +def is_validation(component_type: str) -> bool: + """Check for validation component.""" + return component_type.lower().strip() == validation + + +def synthesize_rule_key( + component_title: str, + component_type: str, + rule_id: str, + check_id: Union[str, None], + target_component: Union[str, None] +) -> tuple: + """Synthesize rule_key.""" + if is_validation(component_type): + rval = (component_title, component_type, rule_id, check_id, target_component) + else: + rval = (component_title, component_type, rule_id, None, None) + return rval + + class CsvToOscalComponentDefinition(TaskBase): """ Task to create OSCAL ComponentDefinition json. @@ -168,7 +189,13 @@ def print_info(self) -> None: """Print the help string.""" name = self.name oscal_name = 'component_definition' - # + # help note identifiers + note01 = '1' + note02 = '2' + note03 = '3' + note04 = '4' + note05 = '5' + # help generation logger.info(f'Help information for {name} task.') logger.info('') logger.info(f'Purpose: From csv produce OSCAL {oscal_name} file.') @@ -188,23 +215,25 @@ def print_info(self) -> None: text1 = ' required columns: ' for text2 in CsvColumn.get_required_column_names(): if text2 in [f'{RULE_DESCRIPTION}', f'{PROFILE_SOURCE}', f'{PROFILE_DESCRIPTION}', f'{CONTROL_ID_LIST}']: - text2 += ' (see note 1)' + text2 += f' (see note {note01})' logger.info(text1 + '$$' + text2) text1 = ' ' text1 = ' optional columns: ' for text2 in CsvColumn.get_optional_column_names(): if text2 in [f'{ORIGINAL_RISK_RATING}', f'{ADJUSTED_RISK_RATING}', f'{RISK_ADJUSTMENT}']: - text2 += ' (see note 1)' + text2 += f' (see note {note01})' + elif text2 in [f'{TARGET_COMPONENT}']: + text2 += f' (see note {note03})' else: - text2 += ' (see note 2)' + text2 += f' (see note {note02})' logger.info(text1 + '$' + text2) text1 = ' ' for text2 in CsvColumn.get_parameter_column_names(): - text2 += ' (see notes 1, 4)' + text2 += f' (see notes {note01}, {note05})' logger.info(text1 + '$' + text2) text1 = ' ' text1 = ' comment columns: ' - text2 = 'Informational (see note 3)' + text2 = f'Informational (see note {note04})' logger.info(text1 + '#' + text2) text1 = ' output-dir = ' text2 = '(required) the path of the output directory for synthesized OSCAL .json files.' @@ -226,23 +255,26 @@ def print_info(self) -> None: text2 = '' logger.info(text1 + text2) text1 = 'Notes: ' - text2 = '[1] column is ignored for validation component type' + text2 = f'[{note01}] column is ignored for validation component type' logger.info(text1 + text2) text1 = ' ' - text2 = '[2] column is required for validation component type' + text2 = f'[{note02}] column is required for validation component type' logger.info(text1 + text2) text1 = ' ' - text2 = '[3] column name starting with # causes column to be ignored' + text2 = f'[{note03}] column is optional for validation component type' + text3 = f', but may be needed to prevent {RULE_ID} collisions' + logger.info(text1 + text2 + text3) + text1 = ' ' + text2 = f'[{note04}] column name starting with # causes column to be ignored' logger.info(text1 + text2) text1 = ' ' - text2 = '[4] additional parameters are specified by adding a common suffix per set' + text2 = f'[{note05}] additional parameters are specified by adding a common suffix per set' text3 = f', for example: {PARAMETER_ID}_1, {PARAMETER_DESCRIPTION}_1, ...{PARAMETER_ID}_2...' logger.info(text1 + text2 + text3) def configure(self) -> bool: """Configure.""" - self._timestamp = datetime.datetime.utcnow().replace(microsecond=0).replace(tzinfo=datetime.timezone.utc - ).isoformat() + self._timestamp = datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0).isoformat() # config verbosity self._quiet = self._config.get('quiet', False) self._verbose = not self._quiet @@ -388,7 +420,7 @@ def _calculate_set_params(self, mod_rules: List) -> tuple: add_set_params = [] mod_set_params = [] for key in cd_set_params: - rule_key = (key[0], key[1], key[2]) + rule_key = synthesize_rule_key(key[0], key[1], key[2], None, None) if rule_key not in mod_rules: continue if key in csv_set_params: @@ -397,7 +429,7 @@ def _calculate_set_params(self, mod_rules: List) -> tuple: del_set_params.append(key) logger.debug(f'params del: {key}') for key in csv_set_params: - rule_key = (key[0], key[1], key[2]) + rule_key = synthesize_rule_key(key[0], key[1], key[2], None, None) if rule_key not in mod_rules: continue if key in cd_set_params: @@ -416,7 +448,7 @@ def _calculate_control_mappings(self, mod_rules: List) -> tuple: add_control_mappings = [] mod_control_mappings = [] for key in cd_controls: - rule_key = (key[0], key[1], key[2]) + rule_key = synthesize_rule_key(key[0], key[1], key[2], None, None) if rule_key not in mod_rules: continue if key in csv_controls: @@ -425,7 +457,7 @@ def _calculate_control_mappings(self, mod_rules: List) -> tuple: del_control_mappings.append(key) logger.debug(f'ctl-maps del: {key}') for key in csv_controls: - rule_key = (key[0], key[1], key[2]) + rule_key = synthesize_rule_key(key[0], key[1], key[2], None, None) if rule_key not in mod_rules: continue if key in cd_controls: @@ -580,7 +612,7 @@ def rules_add(self, add_rules: List[str]) -> None: def _is_validation(self, rule_key: tuple) -> bool: """Check for validation component.""" component_type = self._csv_mgr.get_value(rule_key, COMPONENT_TYPE) - return component_type.lower() == validation + return is_validation(component_type) def _add_rule_prop( self, control_implementation: ControlImplementation, control_mappings: List[str], rule_key: tuple @@ -770,6 +802,7 @@ def set_params_del(self, del_set_params: List[str]) -> None: source = tokens[3] description = tokens[4] param_id = tokens[5] + # ctl impl control_implementation = self._cd_mgr.find_control_implementation( component_title, component_type, source, description ) @@ -792,12 +825,13 @@ def set_params_add(self, add_set_params: List[str]) -> None: source = tokens[3] description = tokens[4] param_id = tokens[5] + # ctl impl control_implementation = self._cd_mgr.find_control_implementation( component_title, component_type, source, description ) control_implementation.set_parameters = as_list(control_implementation.set_parameters) # add - rule_key = _CsvMgr.get_rule_key(component_title, component_type, rule_id) + rule_key = synthesize_rule_key(component_title, component_type, rule_id, None, None) values = [self._csv_mgr.get_default_value_by_id(rule_key, param_id)] set_parameter = SetParameter( param_id=param_id, @@ -814,6 +848,7 @@ def set_params_mod(self, mod_set_params: List[str]) -> None: source = tokens[3] description = tokens[4] param_id = tokens[5] + # ctl impl control_implementation = self._cd_mgr.find_control_implementation( component_title, component_type, source, description ) @@ -822,7 +857,7 @@ def set_params_mod(self, mod_set_params: List[str]) -> None: for set_parameter in self._set_parameter_generator(set_parameters): if set_parameter.param_id != param_id: continue - rule_key = _CsvMgr.get_rule_key(component_title, component_type, rule_id) + rule_key = synthesize_rule_key(component_title, component_type, rule_id, None, None) values = [self._csv_mgr.get_default_value_by_id(rule_key, param_id)] replacement = SetParameter( param_id=param_id, @@ -855,6 +890,7 @@ def control_mappings_del(self, del_control_mappings: List[str]) -> None: source = tokens[3] description = tokens[4] smt_id = tokens[5] + # ctl-id control_id = derive_control_id(smt_id) control_implementation = self._cd_mgr.find_control_implementation( component_title, component_type, source, description @@ -881,13 +917,14 @@ def control_mappings_add(self, add_control_mappings: List[str]) -> None: source = tokens[3] description = tokens[4] smt_id = tokens[5] + # ctl-id control_id = derive_control_id(smt_id) control_implementation = self._cd_mgr.find_control_implementation( component_title, component_type, source, description ) implemented_requirement = self._get_implemented_requirement(control_implementation, control_id) # namespace - rule_key = (tokens[0], tokens[1], tokens[2]) + rule_key = synthesize_rule_key(tokens[0], tokens[1], tokens[2], None, None) ns = self._get_namespace(rule_key) # create rule implementation (as property) name = RULE_ID @@ -1191,7 +1228,7 @@ def accounting_rule_definitions(self, component: DefinedComponent) -> None: if component.props: for prop in component.props: if prop.name == RULE_ID: - key = (component.title, component.type, prop.value) + key = synthesize_rule_key(component.title, component.type, prop.value, None, None) value = prop.remarks self._cd_rules_map[key] = value logger.debug(f'cd: {key} {self._cd_rules_map[key]}') @@ -1381,6 +1418,7 @@ class CsvColumn(): _columns_optional = [ f'{CHECK_ID}', f'{CHECK_DESCRIPTION}', + f'{TARGET_COMPONENT}', f'{ORIGINAL_RISK_RATING}', f'{ADJUSTED_RISK_RATING}', f'{RISK_ADJUSTMENT}', @@ -1457,6 +1495,7 @@ def get_required_column_names_validation() -> List[str]: f'{PARAMETER_VALUE_ALTERNATIVES}', f'{CHECK_ID}', f'{CHECK_DESCRIPTION}', + f'{TARGET_COMPONENT}', f'{ORIGINAL_RISK_RATING}', f'{ADJUSTED_RISK_RATING}', f'{RISK_ADJUSTMENT}', @@ -1505,6 +1544,7 @@ def get_filtered_optional_column_names() -> List[str]: f'{RULE_ID}', f'{CHECK_ID}', f'{CHECK_DESCRIPTION}', + f'{TARGET_COMPONENT}', ] @staticmethod @@ -1553,7 +1593,9 @@ def __init__(self, csv_path: pathlib.Path) -> None: component_description = self.get_row_value(row, f'{COMPONENT_DESCRIPTION}') rule_id = self.get_row_value(row, f'{RULE_ID}') # rule sets - key = _CsvMgr.get_rule_key(component_title, component_type, rule_id) + check_id = self.get_row_value(row, f'{CHECK_ID}', default=None) + target_component = self.get_row_value(row, f'{TARGET_COMPONENT}', default=None) + key = synthesize_rule_key(component_title, component_type, rule_id, check_id, target_component) if key in self._csv_rules_map: text = f'row "{row_num}" contains duplicate {RULE_ID} "{rule_id}"' raise RuntimeError(text) @@ -1594,11 +1636,6 @@ def _control_mappings( key = (component_description, component_type, rule_id, source, description, control) self._csv_controls_map[key] = [row_num, row] - @staticmethod - def get_rule_key(component_title: str, component_type: str, rule_id: str) -> tuple: - """Get rule_key.""" - return (component_title, component_type, rule_id) - def get_parameter_id_column_names(self) -> List[str]: """Get parameter_id column_names.""" col_names = [] @@ -1725,9 +1762,9 @@ def get_row_number(self, rule_key: tuple) -> List: """Get row number for rule.""" return self._csv_rules_map[rule_key][0] - def get_row_value(self, row: List[str], name: str) -> str: + def get_row_value(self, row: List[str], name: str, default='') -> str: """Get value for specified name.""" - rval = '' + rval = default index = self.get_col_index(name) if index >= 0: rval = row[index] diff --git a/trestle/tasks/ocp4_cis_profile_to_oscal_catalog.py b/trestle/tasks/ocp4_cis_profile_to_oscal_catalog.py index fc2c00596..4b0f48f18 100644 --- a/trestle/tasks/ocp4_cis_profile_to_oscal_catalog.py +++ b/trestle/tasks/ocp4_cis_profile_to_oscal_catalog.py @@ -64,8 +64,7 @@ def __init__(self, config_object: Optional[configparser.SectionProxy]) -> None: config_object: Config section associated with the task. """ super().__init__(config_object) - self._timestamp = datetime.datetime.utcnow().replace(microsecond=0).replace(tzinfo=datetime.timezone.utc - ).isoformat() + self._timestamp = datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0).isoformat() def print_info(self) -> None: """Print the help string.""" diff --git a/trestle/tasks/ocp4_cis_profile_to_oscal_cd.py b/trestle/tasks/ocp4_cis_profile_to_oscal_cd.py index f04d4eaa0..cfc1cf7bb 100644 --- a/trestle/tasks/ocp4_cis_profile_to_oscal_cd.py +++ b/trestle/tasks/ocp4_cis_profile_to_oscal_cd.py @@ -63,8 +63,7 @@ def __init__(self, config_object: Optional[configparser.SectionProxy]) -> None: config_object: Config section associated with the task. """ super().__init__(config_object) - self._timestamp = datetime.datetime.utcnow().replace(microsecond=0).replace(tzinfo=datetime.timezone.utc - ).isoformat() + self._timestamp = datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0).isoformat() def set_timestamp(self, timestamp: str) -> None: """Set the timestamp.""" diff --git a/trestle/tasks/oscal_catalog_to_csv.py b/trestle/tasks/oscal_catalog_to_csv.py index b68ed8457..73b1d5b2e 100644 --- a/trestle/tasks/oscal_catalog_to_csv.py +++ b/trestle/tasks/oscal_catalog_to_csv.py @@ -37,7 +37,7 @@ logger = logging.getLogger(__name__) -timestamp = datetime.datetime.utcnow().replace(microsecond=0).replace(tzinfo=datetime.timezone.utc).isoformat() +timestamp = datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0).isoformat() recurse = True diff --git a/trestle/tasks/xlsx_to_oscal_cd.py b/trestle/tasks/xlsx_to_oscal_cd.py index fb966f15e..d55acf303 100644 --- a/trestle/tasks/xlsx_to_oscal_cd.py +++ b/trestle/tasks/xlsx_to_oscal_cd.py @@ -65,8 +65,7 @@ def __init__(self, config_object: Optional[configparser.SectionProxy]) -> None: """ super().__init__(config_object) self.xlsx_helper = XlsxHelper() - self._timestamp = datetime.datetime.utcnow().replace(microsecond=0).replace(tzinfo=datetime.timezone.utc - ).isoformat() + self._timestamp = datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0).isoformat() def set_timestamp(self, timestamp: str) -> None: """Set the timestamp.""" diff --git a/trestle/tasks/xlsx_to_oscal_profile.py b/trestle/tasks/xlsx_to_oscal_profile.py index faaa2ce74..84d587e0c 100644 --- a/trestle/tasks/xlsx_to_oscal_profile.py +++ b/trestle/tasks/xlsx_to_oscal_profile.py @@ -57,8 +57,7 @@ def __init__(self, config_object: Optional[configparser.SectionProxy]) -> None: """ super().__init__(config_object) self.xlsx_helper = XlsxHelper() - self._timestamp = datetime.datetime.utcnow().replace(microsecond=0).replace(tzinfo=datetime.timezone.utc - ).isoformat() + self._timestamp = datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0).isoformat() def set_timestamp(self, timestamp: str) -> None: """Set the timestamp.""" diff --git a/trestle/transforms/transformer_factory.py b/trestle/transforms/transformer_factory.py index 99f23e6c2..ba84bb4f3 100644 --- a/trestle/transforms/transformer_factory.py +++ b/trestle/transforms/transformer_factory.py @@ -28,7 +28,7 @@ class TransformerBase(ABC): """Abstract base interface for all transformers.""" # the current time for consistent timestamping - _timestamp = datetime.datetime.utcnow().replace(microsecond=0).replace(tzinfo=datetime.timezone.utc).isoformat() + _timestamp = datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0).isoformat() @staticmethod def set_timestamp(value: str) -> None: