Merge pull request #14 from IBM/fix/xlsx-to-cd-demo

Demo updates commensurate with trestle task xlsx-to-cd changes.
oscal-compass · Apr 5, 2022 · 9933021 · 9933021
2 parents 1d92c91 + e76b988
commit 9933021
Show file tree

Hide file tree

Showing 7 changed files with 254 additions and 325 deletions.
diff --git a/trestle_task_osco_to_oscal/README.md → ...le_task_osco_result_to_oscal_ar/README.md b/trestle_task_osco_to_oscal/README.md → ...le_task_osco_result_to_oscal_ar/README.md
@@ -1,4 +1,4 @@
-# compliance-trestle-task-osco-to-oscal-demo
+# compliance-trestle-task-osco-result-to-oscal-ar-demo
 
 Simple example of using trestle to facilitate transforming OSCO results to OSCAL (partial) results.
 
@@ -27,15 +27,15 @@ Running the demo
 
 ```
 > cd
-> cd git/compliance-trestle-demos/trestle_task_osco_to_oscal
+> cd git/compliance-trestle-demos/trestle_task_osco_result_to_oscal_ar
 > trestle init
-> trestle task osco-to-oscal -c ./demo-osco-to-oscal.config
+> trestle task osco-result-to-oscal-ar -c ./demo-osco-result-to-oscal-ar.config
 
 output: osco/runtime/ssg-ocp4-ds-cis-111.222.333.444-pod.oscal.json
 inventory: 1
 observations: 125
 results: {}
-Task: osco-to-oscal executed successfully.
+Task: osco-result-to-oscal-ar executed successfully.
 ```
 
 Viewing the result

diff --git a/...k_osco_to_oscal/demo-osco-to-oscal.config → ...al_ar/demo-osco-result-to-oscal-ar.config b/...k_osco_to_oscal/demo-osco-to-oscal.config → ...al_ar/demo-osco-result-to-oscal-ar.config
@@ -1,4 +1,4 @@
-[task.osco-to-oscal]
+[task.osco-result-to-oscal-ar]
 
 input-dir =  osco/input
 output-dir = osco/runtime

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
diff --git a/trestle_task_spread_sheet_to_component_definition/README.md b/trestle_task_spread_sheet_to_component_definition/README.md
@@ -23,7 +23,7 @@ Running the demo
 
     > cd
     > cd git/compliance-trestle-demos/trestle_task_spread_sheet_to_component_definition
-    > trestle task xlsx-to-oscal-component-definition -c ./demo-xlsx-to-component-definition.config
+    > trestle task xlsx-to-oscal-cd -c ./demo-xlsx-to-cd.config
 
 	catalog: trestle-workspace/catalogs/nist-sp-800-53-rev4/catalog.json
 	input: demo.xlsx
@@ -39,7 +39,7 @@ Running the demo
 	rows missing parameters: [2, 7, 8]
 	rows missing parameters values: [5]
 	output: trestle-workspace/catalogs/catalog.json
-	Task: xlsx-to-oscal-component-definition executed successfully.
+	Task: xlsx-to-oscal-cd executed successfully.
 
 Viewing the result
 

diff --git a/trestle_task_spread_sheet_to_component_definition/demo-xlsx-to-component-definition.config b/trestle_task_spread_sheet_to_component_definition/demo-xlsx-to-component-definition.config
@@ -1,4 +1,4 @@
-[task.xlsx-to-oscal-component-definition]
+[task.xlsx-to-oscal-cd]
 
 catalog-file = trestle-workspace/catalogs/nist-sp-800-53-rev4/catalog.json
 spread-sheet-file = demo.xlsx

diff --git a/trestle_task_spread_sheet_to_component_definition/trestle-workspace/catalogs/catalog.json b/trestle_task_spread_sheet_to_component_definition/trestle-workspace/catalogs/catalog.json