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

Convert File Type for Files or Remote Hyperlinks in Continuous Deployment #1070

Merged
merged 2 commits into from
Jan 21, 2022

Conversation

david-waltermire
Copy link
Contributor

@david-waltermire david-waltermire commented Dec 10, 2021

Committer Notes

This PR, as part of enhancements to the current CD pipeline will fix relevant missed conversions between XML and JSON and YAML filetypes, and their respective MIME types, in place of perl and sed issues. This will fix usnistgov/oscal-content#59 and GSA/fedramp-automation#129 on an ongoing basis.

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.

ohsh6o and others added 2 commits December 10, 2021 13:55
…ment (#1010)

* First attempt at Python script to clean up extensions.
* Add Python deps manifest.
* Update Dockerfile with Python dependencies.
* Remove additive dot before file ext and try out adding to CI harness.
* Add first attempt of Python converter.
* updated the tools table
* Rename handler function accordingly, so docs make sense.
* Fix bug with hard-coded conversion for JSON processing.
* Add some more function documentation.
* Complete update of function docstrings.
* A little more function documentation.
* Final function signature touch-ups.

Co-authored-by: Michaela Iorga <michaela.iorga@nist.gov>
Co-authored-by: David Waltermire <david.waltermire@nist.gov>
@david-waltermire david-waltermire marked this pull request as ready for review January 21, 2022 21:23
Copy link
Contributor

@aj-stein-nist aj-stein-nist left a comment

Choose a reason for hiding this comment

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

I am Alexander Stein and I approve this message.

Jokes aside, we tested this works locally in the docker containers invoking the same scripts used by CI/CD (GitHub Actions) and verified they function as desired. Confirmed with Dave superficial YAML difference are acceptable for escaping multi-line comments and we made a best-effort attempt at get line-for-line parity.

@david-waltermire david-waltermire merged commit 3a7130c into main Jan 21, 2022
@david-waltermire david-waltermire deleted the feature-oscal-content-59-convert-file-paths branch January 21, 2022 21:27
oscalbuilder pushed a commit that referenced this pull request Jan 21, 2022
@david-waltermire david-waltermire added this to the OSCAL 1.0.1 milestone Jan 30, 2022
iMichaela added a commit to iMichaela/OSCAL that referenced this pull request Apr 7, 2022
…ment (usnistgov#1070)

* Convert File Type for Files or Remote Hyperlinks in Continuous Deployment (usnistgov#1010)

* First attempt at Python script to clean up extensions.
* Add Python deps manifest.
* Update Dockerfile with Python dependencies.
* Remove additive dot before file ext and try out adding to CI harness.
* Add first attempt of Python converter.
* updated the tools table
* Rename handler function accordingly, so docs make sense.
* Fix bug with hard-coded conversion for JSON processing.
* Add some more function documentation.
* Complete update of function docstrings.
* A little more function documentation.
* Final function signature touch-ups.

Co-authored-by: Michaela Iorga <michaela.iorga@nist.gov>
Co-authored-by: David Waltermire <david.waltermire@nist.gov>

* fix python calls to use correct python version and script

Co-authored-by: Alexander Stein (Inactive) <61464190+ohsh6o@users.noreply.github.com>
Co-authored-by: Michaela Iorga <michaela.iorga@nist.gov>
Rene2mt pushed a commit to Rene2mt/OSCAL that referenced this pull request May 17, 2022
…ment (usnistgov#1070)

* Convert File Type for Files or Remote Hyperlinks in Continuous Deployment (usnistgov#1010)

* First attempt at Python script to clean up extensions.
* Add Python deps manifest.
* Update Dockerfile with Python dependencies.
* Remove additive dot before file ext and try out adding to CI harness.
* Add first attempt of Python converter.
* updated the tools table
* Rename handler function accordingly, so docs make sense.
* Fix bug with hard-coded conversion for JSON processing.
* Add some more function documentation.
* Complete update of function docstrings.
* A little more function documentation.
* Final function signature touch-ups.

Co-authored-by: Michaela Iorga <michaela.iorga@nist.gov>
Co-authored-by: David Waltermire <david.waltermire@nist.gov>

* fix python calls to use correct python version and script

Co-authored-by: Alexander Stein (Inactive) <61464190+ohsh6o@users.noreply.github.com>
Co-authored-by: Michaela Iorga <michaela.iorga@nist.gov>
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.

NIST 800-53 JSON Profiles Link to XML Catalogs
3 participants