Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated prototype shared-responsibility model. #1999

Conversation

iMichaela
Copy link
Contributor

Committer Notes

The prototype shared-responsibility model was updated and the documentation was reviewed. This version of the model is ready for review and integration into the OSCAL v1.2.0 release candidate. The prototype was locally tested with the latest metaschema-xslt/document-display-deprecation

All Submissions:

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

(For reviewers: The wiki has guidance on code review and overall issue review for completeness.)

Changes to Core Features:

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

dependabot bot and others added 30 commits September 28, 2023 10:47
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@f43a0e5...3df4ab1)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@3df4ab1...8ade135)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [build/metaschema-xslt](https://github.com/usnistgov/metaschema-xslt) from `034e92b` to `bd4359a`.
- [Commits](usnistgov/metaschema-xslt@034e92b...bd4359a)

---
updated-dependencies:
- dependency-name: build/metaschema-xslt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Based on the content of the catalog whose controls are being
imported, the prop names should be "label" instead of "place"
and the a1 statement paragraph should include <insert>.

Also, remove a debugging message.
Unselected parent could have multiple children that
are selected, so data type of template must accommodate
multiple elements.
* Deleted duplicate `metaschema_datatypes` file
* Added spec test adr and prototype spec test file
* Spec test harness and minimal example
Bumps [actions/github-script](https://github.com/actions/github-script) from 6.4.1 to 7.0.1.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](actions/github-script@d7906e4...60a0d83)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3.8.1 to 4.0.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@5e21ff4...8f152de)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…stgov#1953)

Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.6.0 to 3.6.1.
- [Commits](apache/maven-dependency-plugin@maven-dependency-plugin-3.6.0...maven-dependency-plugin-3.6.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@8ade135...b4ffde6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [build/metaschema-xslt](https://github.com/usnistgov/metaschema-xslt) from `bd4359a` to `7d9fbfa`.
- [Commits](usnistgov/metaschema-xslt@bd4359a...7d9fbfa)

---
updated-dependencies:
- dependency-name: build/metaschema-xslt
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This ADR documents the team's decision regarding the simplified system lifecycle to be used in the tutorials.
* Flatten codeowners

* Update CODEOWNERS with feedback from the team
…snistgov#1949  (usnistgov#1952)

* Two additional allowed values for catalog/group/part/@name and catalog/group/control/part/@name

* aligned the description of group/part@name='statement' and control/part@name='statement'

* Fixed typo in the oscal_ssp_metaschema and updated controversial constraint for group/part in oscal_catalog_metaschema

* Update src/metaschema/oscal_catalog_metaschema.xml

Fixed grammar.

Co-authored-by: Chris Compton <[email protected]>

---------

Co-authored-by: Iorga <[email protected]>
Co-authored-by: Chris Compton <[email protected]>
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3 to 4.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Remove with-parent-controls from XSLT profile resolver for usnistgov#1816.

* Remove profile resolver with-parent-controls tests for usnistgov#1816.
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@8f152de...b39b52d)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@b39b52d...60edb5d)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
dependabot bot and others added 23 commits March 11, 2024 22:10
Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](softprops/action-gh-release@v1...v2)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
…flicts/permissions that prevented the rebase.
merge `develop` into release candidate rc1 for the shared-responsibility-model
…ded it also in the leveraged-autorization assembly to support OSCAL SSPs for leveraged systems
Merge additional commits from rc1-shared-responsibility -model into prototype-shared-responsibility-model
Removed implemented-by flag from the responsibility assembly.
More enhancements for the documentation of the shared-responsibility model.
@iMichaela iMichaela requested a review from a team as a code owner March 28, 2024 22:12
@david-waltermire
Copy link
Contributor

It's hard to see what is changing in this PR, since this is based on an older commit from develop. This is causing a bunch of non-related changes to be reflected. Can this be rebased on the latest from develop to remove the noise?

@iMichaela
Copy link
Contributor Author

@david-waltermire - The purpose of the PR and proposed merge into the prototype branch was to be able to generate the documentation: the OSCAL Reference for the updated prototype so the review is easier. The merging onto develop would be next step after the prototype is reviewed. In this case, if something is not favorable, we can address it easier. Documentation (OSCAL Reference) from the develop branch cannot be created.

I ran below what you are asking: iMichaela/prototype-shared-responsibility-model against usnistgov/develop and it is not going to be easier to review also because I had to merge develop into the prototype to test the old prototype with the latest from develop.
I personally think having the documentation and the outlines generated will be easier.
I can also generate a features summary using the outline but it will make sense when reviewers have the reference for the prototype updated (there are no major changes from the existing one, more fixing metaschema validation errors and providing the documentation (current OSCAL Reference for the prototypes was not properly documented)

git log upstream/develop..origin/prototype-shared-responsibility-model  --pretty=oneline --abbrev-commit

Summary:
d21591b (origin/prototype-shared-responsibility-model) Merge pull request #9 from iMichaela/rc1-shared-responsibility-model
9ad2278 (origin/rc1-shared-responsibility-model, rc1-shared-responsibility-model) Added remarks in provided, responsibility, inherited and satisfied.
054c0b7 Augemnting reference and added implementation-status to component-def per issue 1300.
7a5098c Model documentation updates.
06d95ec Merge pull request #8 from iMichaela/rc1-shared-responsibility-model
e913114 Removed implemented-by flag from the responsibility assembly.
a3a2f16 Merge pull request #7 from iMichaela/rc1-shared-responsibility-model
a1b0eca Fixed xml-to-json conversion
321c420 Merge pull request #6 from iMichaela/rc1-shared-responsibility-model
6601aac Cleaned a duplicate definition causing transformation errors.
d0ec681 Added flag to satisfy to link it to its interited counterpart.
7285014 Minor updates and enhancements.
4bd5bb5 Added responsibility assembly to component def, corrected group-as name and added sr-uuid flag.
45f6712 Made ssp-uuid not required to support SR from non OSCAL SSP and included it also in the leveraged-autorization assembly to support OSCAL SSPs for leveraged systems
9fe6524 Re-aligned the SSP with the SR.
b9bc8d1 Added reference documentation and other minor changes
dd6e1a3 Fixed validation errors in oscal_responsibility-common_metaschema.xml definition file.
5e71f4d Merge pull request #5 from iMichaela/develop
af8079b (upstream/prototype-shared-responsibility-model, prototype-shared-responsibility-model) Correct errors in metaschema for publishing reference.
:...skipping...
d21591b (origin/prototype-shared-responsibility-model) Merge pull request #9 from iMichaela/rc1-shared-responsibility-model
9ad2278 (origin/rc1-shared-responsibility-model, rc1-shared-responsibility-model) Added remarks in provided, responsibility, inherited and satisfied.
054c0b7 Augmenting reference and added implementation-status to component-def per issue #1300.
7a5098c Model documentation updates.
06d95ec Merge pull request #8 from iMichaela/rc1-shared-responsibility-model
e913114 Removed implemented-by flag from the responsibility assembly.
a3a2f16 Merge pull request #7 from iMichaela/rc1-shared-responsibility-model
a1b0eca Fixed xml-to-json conversion
321c420 Merge pull request #6 from iMichaela/rc1-shared-responsibility-model
6601aac Cleaned a duplicate definition causing transformation errors.
d0ec681 Added flag to satisfy to link it to its interited counterpart.
7285014 Minor updates and enhancements.
4bd5bb5 Added responsibility assembly to component def, corrected group-as name and added sr-uuid flag.
45f6712 Made ssp-uuid not required to support SR from non OSCAL SSP and included it also in the leveraged-autorization assembly to support OSCAL SSPs for leveraged systems
9fe6524 Re-aligned the SSP with the SR.
b9bc8d1 Added reference documentation and other minor changes
dd6e1a3 Fixed validation errors in oscal_responsibility-common_metaschema.xml definition file.
5e71f4d Merge pull request #5 from iMichaela/develop
af8079b (upstream/prototype-shared-responsibility-model, prototype-shared-responsibility-model) Correct errors in metaschema for publishing reference.
1bec88e Update the snapshot of artifacts.
81ebeaf Add missing imports.
c746a97 Updated snapshot for review.
b03cc53 Fix invalid metaschema.
577b974 Update snapshot.
b9312fd Update SR metaschema.
13705b9 Sample snapshot.
:...skipping...
d21591b (origin/prototype-shared-responsibility-model) Merge pull request #9 from iMichaela/rc1-shared-responsibility-model
9ad2278 (origin/rc1-shared-responsibility-model, rc1-shared-responsibility-model) Added remarks in provided, responsibility, inherited and satisfied.
054c0b7 Augemnting reference and added implementation-status to component-def per issue 1300.
7a5098c Model documentation updates.
06d95ec Merge pull request #8 from iMichaela/rc1-shared-responsibility-model
e913114 Removed implemented-by flag from the responsibility assembly.
a3a2f16 Merge pull request #7 from iMichaela/rc1-shared-responsibility-model
a1b0eca Fixed xml-to-json conversion
321c420 Merge pull request #6 from iMichaela/rc1-shared-responsibility-model
6601aac Cleaned a duplicate definition causing transformation errors.
d0ec681 Added flag to satisfy to link it to its interited counterpart.
7285014 Minor updates and enhancements.
4bd5bb5 Added responsibility assembly to component def, corrected group-as name and added sr-uuid flag.
45f6712 Made ssp-uuid not required to support SR from non OSCAL SSP and included it also in the leveraged-autorization assembly to support OSCAL SSPs for leveraged systems
9fe6524 Re-aligned the SSP with the SR.
b9bc8d1 Added reference documentation and other minor changes
dd6e1a3 Fixed validation errors in oscal_responsibility-common_metaschema.xml definition file.
5e71f4d Merge pull request #5 from iMichaela/develop
af8079b (upstream/prototype-shared-responsibility-model, prototype-shared-responsibility-model) Correct errors in metaschema for publishing reference.
1bec88e Update the snapshot of artifacts.
81ebeaf Add missing imports.
c746a97 Updated snapshot for review.
b03cc53 Fix invalid metaschema.
577b974 Update snapshot.
b9312fd Update SR metaschema.
13705b9 Sample snapshot.
82495bc Update assemblies - some errors and omissions.
547e351 Remove export, implementation-status, shared resp. assemblies.
0a5cde8 Remove capabilities assembly from sr.
52d6e2d Remove import-component-definition from sr.
f97d3d7 Remove unexpected inherited and satisfied from export.
:...skipping...
d21591b (origin/prototype-shared-responsibility-model) Merge pull request #9 from iMichaela/rc1-shared-responsibility-model
9ad2278 (origin/rc1-shared-responsibility-model, rc1-shared-responsibility-model) Added remarks in provided, responsibility, inherited and satisfied.
054c0b7 Augemnting reference and added implementation-status to component-def per issue 1300.
7a5098c Model documentation updates.
06d95ec Merge pull request #8 from iMichaela/rc1-shared-responsibility-model
e913114 Removed implemented-by flag from the responsibility assembly.
a3a2f16 Merge pull request #7 from iMichaela/rc1-shared-responsibility-model
a1b0eca Fixed xml-to-json conversion
321c420 Merge pull request #6 from iMichaela/rc1-shared-responsibility-model
6601aac Cleaned a duplicate definition causing transformation errors.
d0ec681 Added flag to satisfy to link it to its interited counterpart.
7285014 Minor updates and enhancements.
4bd5bb5 Added responsibility assembly to component def, corrected group-as name and added sr-uuid flag.
45f6712 Made ssp-uuid not required to support SR from non OSCAL SSP and included it also in the leveraged-autorization assembly to support OSCAL SSPs for leveraged systems
9fe6524 Re-aligned the SSP with the SR.
b9bc8d1 Added reference documentation and other minor changes
dd6e1a3 Fixed validation errors in oscal_responsibility-common_metaschema.xml definition file.
5e71f4d Merge pull request #5 from iMichaela/develop
af8079b (upstream/prototype-shared-responsibility-model, prototype-shared-responsibility-model) Correct errors in metaschema for publishing reference.
1bec88e Update the snapshot of artifacts.
81ebeaf Add missing imports.
c746a97 Updated snapshot for review.
b03cc53 Fix invalid metaschema.
577b974 Update snapshot.
b9312fd Update SR metaschema.
13705b9 Sample snapshot.
82495bc Update assemblies - some errors and omissions.
547e351 Remove export, implementation-status, shared resp. assemblies.
0a5cde8 Remove capabilities assembly from sr.
52d6e2d Remove import-component-definition from sr.
f97d3d7 Remove unexpected inherited and satisfied from export.
779b4db Commit artifacts for review.
8dbbe73 Add shared responsibility model prototype.
c5713cd Merge branch 'prototype-shared-responsibility-model' of https://github.com/usnistgov/OSCAL into prototype-shared-responsibility-model
0f02760 Add satisfied uuid
098e0e5 Deprecate export
54f539c Correct naming
bd76aeb Adjust assemblies
6626854 Looking at a few options.
e7e7591 Fix shared flag.
1222c08 Adjust wording.
8941eb3 Try exportable attribute on shared-responsibility.
39ab376 correct exportable tag.
5a03de7 Add exportable attribute to implementation-status
cae8a0b Update assemblies.
ae65ea3 Separate assemblies for provided and responsibility
e056da6 Add inherited and satisfied
f29d09c Place shared assemblies and flags in a common
8eef8b5 Initial add of shared-responsibility assembly.
8b8857f Add satisfied uuid
4722eeb Deprecate export
f6f63b4 Correct naming
070db28 Adjust assemblies
8302c2c Looking at a few options.
aba6cc8 Fix shared flag.
b578dd9 Adjust wording.
6f9386f Try exportable attribute on shared-responsibility.
a5706f8 correct exportable tag.
44d3f2c Add exportable attribute to implementation-status
d9c21f0 Update assemblies.
ff0047a Separate assemblies for provided and responsibility
dbfe095 Add inherited and satisfied
2d0e5c5 Place shared assemblies and flags in a common
9edc813 Initial add of shared-responsibility assembly.
e5b6e79 Bump markdown-link-check from 3.10.2 to 3.11.2 in /build (#1864)
948e88a Bump actions/checkout from 3.3.0 to 3.5.3 (#1863)
2a90880 Bump actions/setup-node from 3.6.0 to 3.7.0 (#1854)
d6aed1c Add XSLT runner utility (#1879)
64e130f Script and dependency fixes for v1.1.0 content updates (#1874)
05ee674 Remove dead code for biblio for #1841 (#1875)
e9cce42 (upstream/define-5-common-responsibility-assemblies) [skip ci] Address PR feedback from @iMichaela.
6374f41 [skip ci] Clarify guidance for #1864. (#1869)
1f45b52 Added artifact usage + corrected dead links (#1865)

@nikitawootten-nist
Copy link
Contributor

Superseded by #2000

@iMichaela iMichaela deleted the prototype-shared-responsibility-model branch April 3, 2024 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants