From 8fcd30f00b5a379c355ca793777ab6ab98516f6a Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Mon, 14 Nov 2022 17:47:18 -0500 Subject: [PATCH] Loosen OSCAL document instance file filter. Convert and validate most of the XML-source examples. --- src/config | 36 ++++++------------ src/examples/ssp/{xml => }/actions/README.md | Bin .../xml}/example-approval-ssp.xml | 0 .../xml}/example-request-changes-ssp.xml | 0 4 files changed, 12 insertions(+), 24 deletions(-) rename src/examples/ssp/{xml => }/actions/README.md (100%) rename src/examples/ssp/{xml/actions => actions/xml}/example-approval-ssp.xml (100%) rename src/examples/ssp/{xml/actions => actions/xml}/example-request-changes-ssp.xml (100%) diff --git a/src/config b/src/config index ff45fff4..50d51ff7 100644 --- a/src/config +++ b/src/config @@ -1,25 +1,13 @@ # path to source|format of source|model of source|format(s) to convert to -#src/examples/catalog/xml/*.xml|xml|catalog|json -#src/examples/ssp/xml/*.xml|xml|ssp|json -src/examples/ssp/xml/actions/*.xml|xml|ssp|json -# TODO: Review this error, cause unclear need to do RCA before merge. -# /home/runner/work/oscal-content/oscal-content/git-content/src/examples/ssp/json/ssp-example.json invalid -# [ -# { -# instancePath: '/system-security-plan/system-characteristics/props/0/name', -# schemaPath: '#/properties/name/allOf/1/enum', -# keyword: 'enum', -# params: { allowedValues: [Array] }, -# message: 'must be equal to one of the allowed values' -# } -# ] -# https://github.com/usnistgov/oscal-content/actions/runs/3191841714/jobs/5208629060 -# src/examples/ssp/json/ssp-example.json|json|ssp|xml -#src/examples/component-definition/json/example-component.json|json|component|xml -#src/examples/component-definition/xml/*.xml|xml|component|json -#src/nist.gov/SP800-53/rev4/xml/*catalog.xml|xml|catalog|json -#src/nist.gov/SP800-53/rev4/xml/*profile.xml|xml|profile|json -#src/nist.gov/SP800-53/rev5/xml/*catalog.xml|xml|catalog|json -#src/nist.gov/SP800-53/rev5/xml/*profile.xml|xml|profile|json -#src/nist.gov/SP800-53/rev5/xml/draft/*catalog.xml|xml|catalog|json -#src/nist.gov/SP800-53/rev5/xml/draft/*profile.xml|xml|profile|json +src/examples/catalog/xml/*.xml|xml|catalog|json +src/examples/ssp/xml/*.xml|xml|ssp|json +src/examples/ssp/actions/xml/*.xml|xml|ssp|json +src/examples/ssp/json/ssp-example.json|json|ssp|xml +src/examples/component-definition/json/example-component.json|json|component|xml +src/examples/component-definition/xml/*.xml|xml|component|json +src/nist.gov/SP800-53/rev4/xml/*catalog.xml|xml|catalog|json +src/nist.gov/SP800-53/rev4/xml/*profile.xml|xml|profile|json +src/nist.gov/SP800-53/rev5/xml/*catalog.xml|xml|catalog|json +src/nist.gov/SP800-53/rev5/xml/*profile.xml|xml|profile|json +src/nist.gov/SP800-53/rev5/xml/draft/*catalog.xml|xml|catalog|json +src/nist.gov/SP800-53/rev5/xml/draft/*profile.xml|xml|profile|json diff --git a/src/examples/ssp/xml/actions/README.md b/src/examples/ssp/actions/README.md similarity index 100% rename from src/examples/ssp/xml/actions/README.md rename to src/examples/ssp/actions/README.md diff --git a/src/examples/ssp/xml/actions/example-approval-ssp.xml b/src/examples/ssp/actions/xml/example-approval-ssp.xml similarity index 100% rename from src/examples/ssp/xml/actions/example-approval-ssp.xml rename to src/examples/ssp/actions/xml/example-approval-ssp.xml diff --git a/src/examples/ssp/xml/actions/example-request-changes-ssp.xml b/src/examples/ssp/actions/xml/example-request-changes-ssp.xml similarity index 100% rename from src/examples/ssp/xml/actions/example-request-changes-ssp.xml rename to src/examples/ssp/actions/xml/example-request-changes-ssp.xml