Initial setup of CI/CD #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…#358) * refactored directory structure to match the structure defined in issue #331. * removed travis config * removed generated documentation from the repository and added a script to generate them * initial commit of site build * Updated readmes to fix broken links and cleaned up unused files * Added a CircleCI status badge * merged in python scripts from #355. Enhanced error reporting for JSON validation script. * Updated out of date JSON files
* removed unused files. * Added ssp metaschema operations back into the metaschema pipeline * Ensure that workflows will not run in the nist-pages branch
* Issue #348 changes to profile metaschema, with its schema. Changed FedRAMP examples to be valid to the new schema. Deleted obsolescent JSON examples (to be regenerated). * Repairing small bug in schema documentation
* Adjustment in metaschema XSD to support declaring any field or assembly to be required. Adjustments to catalog and profile metaschema. Also extending JSON schema production to support this feature in generated JSON schemas. * Updated schemas and NIST examples to new model (no more title at the top) * Adding 'img' element to prose module usnistgov#284
* Metaschema modifications to require link/@href. Mod to catalog data. * Corrected "Appendix J" links to point to Rev 4 DOI
* Significant refactoring of catalog model with metadata and back matter. New catalog conforming to new catalog schema. See usnistgov#166. * More redesign of references to citations and resources. Corresponding XSDs and modifications to catalog and profile examples. * Now with more changes to document metadata see comments on PR #385 * Content adjustments as requested on PR #385
* Significant refactoring of catalog model with metadata and back matter. New catalog conforming to new catalog schema. See usnistgov#166. * More redesign of references to citations and resources. Corresponding XSDs and modifications to catalog and profile examples. * Adjusted metaschemas, schemas and SP800-53 and FedRAMP catalog and profiles to reflect new requirement for 'name' (not 'class') on properties and parts. 'ns' is also provided to qualify FedRAMP parts. * Correcting emergent bug in metadata metaschema (duplicate 'link' declaration) * Reverting to upstream versions of generated content
- Added file naming conventions for XSL conversion templates - Renamed schema files to follow the naming guidance - Reorganized metaschema docuemntation - Refactored scripts to produce files using correct names - Fixed broken links in repo and website - Fixed spelling errors and broken links - Added markdown-link-checker to CI process to check PRs for broken links - Added colorization to many build messages - Added support for JSON min and YAML content generation from JSON files (using prettyprint)
* Updated metaschema schemas, metadata metaschema, to current versions in neighbor branch issue388-json-improvements * Metaschema adjustments to require `oscal-version`, with data element added to catalog and profile samples * Catalog metaschema now passes the Schematron without warnings on unused definitions * Refreshed time stamps
- Implemented Round Trip testing of XML->JSON->XML on content in CI/CD workflow. - Repaired error in catalog and profile metaschemas, with Schematron checks to detect these errors. - Removing whitespace stripping in converted content - Repairing bug in round trip handling of quote marks " (usnistgov#7)
- Improved the schema documentation. - Changed the namespace for examples to: http://csrc.nist.gov/ns/oscal/example. - Added support for listing valid-values for flags and fields. Valid values can be assigned directly in the define-flag or define-field, or they can be defined or overridden in a referencing flag or field entry. - Fixed some typos and formatting in the document generation templates. - Added support for anchor "a" tags in documentation markup processing. Anchors could be included before, but they would not render in the final documentation. - Added support to use the description of a define-flag, define-field, or define-assembly in a content model. This can overridden by defining a description on the referencing flag, field, or assembly entry. - Added hack to map filenames between XML and JSON during conversion. Also added JSON validation of generated files - Improved runtime use of the runall script, allow for more selective behavior of sub-scripts run
…) Modeling.md (#433)
This makes it consistent with other profiles, so it is easier to diff(1) the files and see actual differences in requirements.
* Supporting enumerated value lists on flags in XSD and JSON Schema #437
* Metaschema improvements and remodeling flags support (local definitions; moving w/in the model; valid values)
* More Metaschema syntax remodeling: now using max-occurs and min-occurs for cardinality indicators #441
* Updating schemas to current model (transitional); updated docs in resulting XSD per #448; some updates to markdown documentation
* Small updates to authoring CSS.
* Added design notes on JSON schema bindings.
* Including an initial set of unit tests for group-by, some data types, etc.
* Updated to new design (#436): Metaschema schema, Schematron, metaschema update XSLT - will break the build for now
* Work on datatyping #436 including support in XML and JSON Schema
* Addressed #451: parameter insertion syntax in Markdown
* Schema documentation improvements #423 #424 #428
* Addressed feature request #438
* Improving handling of JSON 'key' and 'value-key' settings in docs #428
* Now producing XML and JSON model maps from metaschemas.
* Now escaping {{ for Jekyll
* Updated component metaschema based on design notes
* Fixed schematron assertions to properly work with @ref.
* Refactoring of component and SSP metachema.
* Fixed website side navigation. Added component and SSP metaschema to site generation process.
* Addressed comments in issue #445
* Added site content generation to runall.sh
* Started documenting model changes in release notes. More work is still needed to complete this.
* Schematron now reports duplicate definitions in a Metaschema as an error: see #465, #475 * Catalog metaschema and SP800-53 catalog adjustments renaming 'subcontrol' to 'control' per Issue #473 * Refactored metaschemas to avoid definition clashes; more/better Schematron to detect such clashes * Adding new module now required by catalog and profile metaschemas * Revising profiles to be valid to newly revised schema (no more references to subcontrol elements only controls) * Bug fix in Metaschema Schematron * Delete FedRAMP_HIGH-baseline_profile.xml * Delete FedRAMP_LOW-baseline_profile.xml * Delete FedRAMP_MODERATE-baseline_profile.xml * Create temp.txt * Revised FedRAMP Profiles These files include revisions to the FedRAMP baselines, plus a small FedRAMP catalog that provides three subcontrols added by FedRAMP. * Delete temp.txt * moved updated fedramp content to correct location * New and improved FedRAMP profiles * Repaired broken markdown conversion; added missing title content to FedRAMP catalog * add note about b -> strong and i -> em (usnistgov#9) * Changed inline markup in FedRAMP profiles for lossless conversion * One more adjustment in Markdown->XML conversion (images) * One more time (cleaning up cleanup)
…e three FedRAMP baselines. (#483)
* Removed unnecessary metaschema check on json-value-key * Now implementing in-xml="with-wrapper | unwrapped" on markup multiline fields, with default `with-wrapper` and corresponding changes to catalog and profile metaschemas. * Updating catalog and profile schemas for (prose) unwrapping behavior * Renamed 'json-behavior' in Metaschema to 'in-json' for consistency with 'in-xml'. * Updating syntax in metaschemas 'in-json' for 'json-behavior' * Updating json converter generator to provide in-xml behavior 'GROUPED' * Refining json converter production from Metaschema * Repairing egregious syntax error * Rectify bug introduced with new feature * Adding support for 'date' and 'dateTime' datatypes, with no time zones (#480), including unit tests * Improvements and corrections to datatypes docs * More small repairs on datatypes descriptions (table markup) * Built out validations of allowed (enumerated) values, including Metaschema validation checks on whether given allowed values conform to their nominal type. * Straightening kinks in datatype metaschema meta-validation * More special handling of recalcitrant datatypes, this time 'NMTOKENS' and 'IDREFS' * Addressing #463, adding `id`, `class` and `title` to `group` in profiles. * Schematron improvements; documentation revisions (removing references to subcontrols) * New Schematron for SP800-53-style catalogs * Removed using in implementation to new metaschema for storage. Started on example, which is still invalid * More work on an example, which is still not valid * refactored schematron processing * more work on SSP example * Refactored generate-schema.sh to allow a metaschema to be provided on the CLI * refactored SSP model to be more flat, while allowing component references * slight cleanup * old example * Fixed content generation * updated metaschema to new specs * fixed content errors * added metaschema examples * Updated metaschema example. * Adding 'prop' and 'part' to Profile Metaschema per #463 * Added 'param' to profile 'group' model * JSON converter now properly handling flags assigned to assemblies identified by json key * Added 'sort-id' property to controls in SP800-53 catalog * Added support for direct generation of schema and converters * Minor updates to SSP example and metaschema * Adding computer build metaschema examples * Extending allowed-values support to fields; unit tests: #437 * More work on allowed-values, now in XSD with unit tests for #437 * Repairing small datatyping bug thanks to regression testing * Further adjustment for allowed-values in docs * Renamed unit tests, now working * Adding allowed-values unit tests * Addressing #452: cleaned up character handling in XML-to-JSON conversion. Fixed the bug this exposed in markdown->HTML conversion. Added some light unit testing. * More adjustments in view of comments to #452 * Repairing more bugs in character handling in Markdown and plain text, with unit testing: #452 * Improvements to Schematron for SP800-53 #400 * For #452, modified copy-and-convert script to suppress character-level post-processing in generated JSON; added unit tests for URIs to detect issues with solidus characters '/' * Edited docs, including datatypes page per #452 (regarding character escapes). * Cleanup metaschema valdiation errors * changed use of the ID and IDREF datatype to NCName * Removed ID and IDREF datatypes * refactored components out of ssp metaschema * Updated SP800-53 catalog and NIST profiles to current model * Added name to information type. * Continued refinement of the SSP model * Updated metadata syntax * changing CM-6 constraint to guidance * continued work on SSP * refactored responsible party to metadata * fixed validation issues * Fixed overriding enumerated values * Fixed content validation errors based on latest metaschema changes * Completed full pass through ssp model * added prop to resource * Fixed broken links in Markdown files. Small adjustments to SSP example. * FDixed relapath error caused when the generated schema directory doesn't exist. Also attempting a fix for CircleCI colorized escape codes causing extra characters to appear. * Fixed validation issue with component metaschema * attempting to fix extra characters in CircleCI colorized messages * Updated enumerated values to remove values that should appear in a given context * quick reordering of elements * hardcode ascii color codes * Fixing broken links in readmes; file name update for consistency * added unit tests for bug * fixed color escaping in scripts * Removed bogus unit test and fixed a small cardinality issue in the SSP model * Improvements to docs generation * Added JSON value keys to fields with flags (that did not have them) * Bug reduction in XSD production mainly related to datatypes and allowed values * Fixing glitch in JSON converter generator * Adjustments repairing Metaschema issues * CSS tweak in docs (model maps to use USWDS font) * Adding to Milestone 2 release notes (in progress) * Change to parameter setting in profile model (#494, #288); release notes towards M2 * Small improvements to copy in release notes (draft) * Updating metaschemas to latest syntax, with improved Metaschema Schematron and unit test tweakage * Adjustments to flag unit test and release notes * SSP Metaschema review and update * cleanup of unused role-id field * reflactored role-id * updated documentation for release. * cleanup of IDs * Minor schema and metaschema improvements * M1 to M2 content converter * Merging local and upstream changes to json example * Relaxing rule over 'ID' flag to accept any string not only XML NCName * reorganizing content for release * more file moves * Fixed changed path * Updated FedRAMP profiles and catalog to current models * Bug fix to XML-to-JSON converter generator * Fixed copy script * Updated FedRAMP baselines and catalog to match new metaschema syntax * fixed merge error * fixed another merge error * fixed spelling issues * Fix from Wendell
Resolves #556
Fixed stray whitespace in 800-53 catalog. Updating to latest USWDS theme.
* adding rev5 content and documentation * updating line ending handling for scripts
Added config option to support profile-resolution. Updating to latest metaschema. Fixes to profile catalog references to make them relative.
* Renamed group-as names to make them more consistent. * Moved levergaed-authorizations to system-implementation. Made system-implementation and control-implementation required. * Added metadata and fixed other front matter in content * Updated examples with AU-5 mock-up data * Filled in missing titles and descriptions. Added role/user. * Updates to examples. Tweak to SSP Metaschema * Adding metaschema support for UUIDs. Implemented uuids addressing issue #676. * Fixed broken schema and schematron paths. * Fixed content to use new uuid-based flags. * Profile resolution test set update to M3 models * Updating profile resolver; renaming uuid support XSLT (usnistgov#42) * Removed SSL certificate check for wget to deal with broken SSL cert on apache archive site. * Updated OSCAL version in metaschema files. * Migrated definition of a system interconnection and service into components. The "service" and "interconnection" component types are now used to define these. (#498) * Flattened party -> org/person to be just party. Party now has a type which identifies if the party is a person or organization. * Added SHA-3 algorithms to the hash algorithm list. (#632) * Fixed Docker container to run scripts that require in-place editing. * Fixed SSP elements that reference a component UUID, but lacked the correct type. * Added a location title. * Updating metaschema support to fix bug (usnistgov/metaschema#56). * Added "homepage" link relation. * Fixed message error in round-trip validation which indicated the wrong type of conversion as compared to what was actually happening. Fixed remaining round-trip issues. * Updated Assessment Metaschemas * Updated FedRAMP Profiles * WIP - UUID transition prep * WIP assessment * Finished UUID Transition * Significant assessment metaschema updates * Assessment metaschema changes * Assessment metaschema changes * party assembly tweaks * Assessment Metaschema Updates * Updated FedRAMP Profiles * additional assessment model tweaks * SAR and POA&M Model Adjustments * Metaschema gymnastics * Fixed invalid content. * SSP Example - Remove Schema Line * Baselines with relative path to catalog * Baseline path tweaks Co-authored-by: David Waltermire <[email protected]> Co-authored-by: Wendell Piez <[email protected]> Co-authored-by: Wendell Piez <[email protected]>
* Adding m3 patch update - #682 rewriting UUIDs as actual uuids, with incoming references * Updated contents and links with UUIDs * Updating profile examples used in unit tests with UUIDs
* Completing and cleaning up release upgrade and XSLTs * Adjusting SSP metaschema to have uuid instead of id at the top #676 * Updated Markdown version of change history log
* Updated readme to remove missing architecture diagram and to include milestone 3 info. (#696) * Added the component example to the CI/CD. (#698) Updated component example to be valid to milestone 3 schema.
* Metaschema Updates - id to uuid fixes, poam tweaks * set uuid to optional for prop and annotation * updated SSP example plus party-uuids JSON array name fix under component/responsible-role * added remarks to by-component assembly * diabled link to schematron.com since the site has been down for over 48 hours, preventing our CI/CD validation from passing * revised link to schematron.com since the site has been down for over 48 hours, preventing our CI/CD validation from passing * made end field optional under options in POA&M model and also in the assessment results. * Updated parameters for SA-9(5) per FedRAMP JAB * Fixed typo * Changed date-time-stamp to collected, and added expires to finding/poam-item. Added remediation-deadline to risk. * no change. Added a blank line to the end to re-trigger CI/CD build * tweaked presentation of new SA-9(5) parameter constraints * put original schematron.com link back now that site is up * fixed incorrect cardinality of objectives/objetive
* #727: Four baselines derived from source data for SP800-53B rev 5 FPD: LOW, MODERATE, HIGH and PRIVACY. * Corrected names; corrected an invalid value. * Providing missing metadata; correcting broken import * Repairing small error in titles.
david-waltermire
pushed a commit
that referenced
this pull request
Feb 11, 2021
…te-rc2 Upgrade AJV support in CI/CD
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.