fix xccdf, from osco (#35)

Signed-off-by: degenaro <[email protected]>
oscal-compass · May 16, 2023 · 8a2a0f4 · 8a2a0f4
1 parent 0634a0c
commit 8a2a0f4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -66,9 +66,9 @@ The Centre for Internet Security (CIS) produce a number of cross industry standa
 
 This [demonstration](./trestle_task_spread_sheet_to_component_definition) shows how to use the `trestle task xlsx-to-oscal-cd` functionality.
 
-*Convert an OpenShift Compliance Operator (OSCO) results into a partial `assessment-results`*
+*Convert an `xccdf` results into a partial `assessment-results`*
 
-This [demonstration](./trestle_task_osco_result_to_oscal_ar) shows how to use the `trestle task osco_result_to_oscal_ar` functionality.
+This [demonstration](./trestle_task_xccdf_result_to_oscal_ar) shows how to use the `trestle task xccdf_result_to_oscal_ar` functionality.
 
 ## Trestle as Foundation Examples
 

diff --git a/trestle_task_osco_result_to_oscal_ar/demo-osco-result-to-oscal-ar.config b/trestle_task_osco_result_to_oscal_ar/demo-osco-result-to-oscal-ar.config
diff --git a/...le_task_osco_result_to_oscal_ar/README.md → ...e_task_xccdf_result_to_oscal_ar/README.md b/...le_task_osco_result_to_oscal_ar/README.md → ...e_task_xccdf_result_to_oscal_ar/README.md
@@ -1,6 +1,6 @@
-# compliance-trestle-task-osco-to-oscal-demo
+# compliance-trestle-task-xccdf-to-oscal-demo
 
-Simple example of using trestle to facilitate transforming OSCO results to OSCAL (partial) results.
+Simple example of using trestle to facilitate transforming XCCDF results to OSCAL (partial) results.
 
 ## Prerequisites
 
@@ -27,21 +27,21 @@ Running the demo
 
 ```
 > cd
-> cd git/compliance-trestle-demos/trestle_task_osco_to_oscal
+> cd git/compliance-trestle-demos/trestle_task_xccdf_result_to_oscal_ar
 > trestle init
-> trestle task osco-result-to-oscal-ar -c ./demo-osco-to-oscal.config
+> trestle task xccdf-result-to-oscal-ar -c ./demo-xccdf-result-to-oscal-ar.config
 
-output: osco/runtime/ssg-ocp4-ds-cis-111.222.333.444-pod.oscal.json
+output: xccdf/runtime/ssg-ocp4-ds-cis-111.222.333.444-pod.oscal.json
 inventory: 1
 observations: 125
 results: {}
-Task: osco-to-oscal executed successfully.
+Task: xccdf-to-oscal executed successfully.
 ```
 
 Viewing the result
 
 ```
-> cat osco/runtime/ssg-ocp4-ds-cis-111.222.333.444-pod.oscal.json
+> cat xccdf/runtime/ssg-ocp4-ds-cis-111.222.333.444-pod.oscal.json
 {
   "results": [
     {
@@ -53,12 +53,12 @@ Viewing the result
       "props": [
         {
           "name": "scanner_name",
-          "ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/osco",
+          "ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/xccdf",
           "value": "OpenSCAP"
         },
         {
           "name": "scanner_version",
-          "ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/osco",
+          "ns": "https://ibm.github.io/compliance-trestle/schemas/oscal/ar/xccdf",
           "value": "1.3.3"
         },
     ...

diff --git a/trestle_task_xccdf_result_to_oscal_ar/demo-xccdf-result-to-oscal-ar.config b/trestle_task_xccdf_result_to_oscal_ar/demo-xccdf-result-to-oscal-ar.config
@@ -0,0 +1,5 @@
+[task.xccdf-result-to-oscal-ar]
+
+input-dir =  xccdf/input
+output-dir = xccdf/runtime
+output-overwrite = true
diff --git a/.../ssg-ocp4-ds-cis-111.222.333.444-pod.yaml → .../ssg-ocp4-ds-cis-111.222.333.444-pod.yaml b/.../ssg-ocp4-ds-cis-111.222.333.444-pod.yaml → .../ssg-ocp4-ds-cis-111.222.333.444-pod.yaml