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.

Sign up for GitHub

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

Jump to bottom

Updated FedRAMP Baselines #546

Merged
merged 2 commits into from
Dec 6, 2019
Merged

Updated FedRAMP Baselines #546

merged 2 commits into from
Dec 6, 2019

Conversation

brian-ruf
Copy link
Contributor

Committer Notes

Updated FedRAMP baselines as OSCAL profiles and resolved profiles.
These use the revised profile schema with the new alter/add/@id-ref syntax

All Submissions:

  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?
  • Have you squashed any non-relevant commits and commit messages? [instructions]
  • Do all automated CI/CD checks pass?

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.

@david-waltermire david-waltermire mentioned this pull request Dec 5, 2019
Closed
bradh
bradh reviewed Dec 5, 2019
View reviewed changes
docs/content/contribute/devlunch.md Outdated
@@ -3,9 +3,17 @@ title: Lunch with the Devs
description: Contact Us
---

{{% usa-intro %}}To increase communication with the OSCAL community, the NIST OSCAL team is hosting a one-hour teleconference every two weeks starting on Thursday, December 5th 2019 @ noon EST.{{% /usa-intro %}}
{{% usa-intro %}}To increase communication with the OSCAL community, the NIST OSCAL team is hosting a one-hour teleconference every two weeks starting on Thursday, December 5th 2019 @ noon EST.{{% /usa-intro %}}Global
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change probably doesn't belong in this PR

Copy link
Contributor

@david-waltermire david-waltermire Dec 5, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed. We need to do a better job of keeping PRs more focused on a single set of related changes.

@david-waltermire
Copy link
Contributor

@brianrufgsa Can you rebase this against master?

To do this you can run the command:

git pull -r upstream master

david-waltermire
david-waltermire reviewed Dec 5, 2019
View reviewed changes
src/metaschema/oscal_profile_metaschema.xml Outdated
Comment on lines 395 to 404
<define-flag as-type="NCName" name="position">
<formal-name>Position</formal-name>
<description>Where to add the new content with respect to the targeted element (beside it or inside it)</description>
<allowed-values><!-- TODO: define these -->
<enum value="before"/>
<enum value="after"/>
<enum value="starting"/>
<enum value="ending"/>
</allowed-values>
</define-flag>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brianrufgsa Can you explain this change?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@david-waltermire-nist I did all that, and when I prepared the pull request it only showed my eight files. I am not sure what is happening. It was only supposed to be the four FedRAMP baselines and resolved profiles.

david-waltermire
david-waltermire reviewed Dec 5, 2019
View reviewed changes
xml/convert/oscal_catalog_json-to-xml-converter.xsl Outdated
Comment on lines 1289 to 1295
<xsl:apply-templates mode="#current" select="*[@key=('title')]"/>
<xsl:apply-templates mode="#current" select="*[@key=('param', 'parameters')]"/>
<xsl:apply-templates mode="#current" select="*[@key=('prop', 'properties')]"/>
<xsl:apply-templates mode="#current" select="*[@key=('annotation', 'annotations')]"/>
<xsl:apply-templates mode="#current" select="*[@key=('link', 'links')]"/>
<xsl:apply-templates mode="#current" select="*[@key=('part', 'parts')]"/>
<xsl:apply-templates mode="#current" select="*[@key=('control', 'controls')]"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brianrufgsa You shouldn't commit any changes against files in the xml, json, or content directories, since these files are generated by the CI/CD. Can you revert these files?

david-waltermire
david-waltermire suggested changes Dec 5, 2019
View reviewed changes
Copy link
Contributor

@david-waltermire david-waltermire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR makes changes to the /content, /xml, and /json directories which are maintained by the CI/CD. These file changes need to be reverted. The PR should also be rebased against master.

@david-waltermire david-waltermire merged commit cd73ea9 into usnistgov:master Dec 6, 2019
@wendellpiez wendellpiez mentioned this pull request Feb 6, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bradh bradh bradh left review comments

@david-waltermire david-waltermire david-waltermire approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@brian-ruf @david-waltermire @bradh