chg: dev: make new_csv_hdrs a list again, add ID column

* save chk script and update default oscal.yaml

Signed-off-by: Steve Arnold <sarnold@vctlabs.com>

scripts/xform_idchk.py

@@ -0,0 +1,23 @@
+"""
+Simple consumer test.
+"""
+
+from natsort import os_sorted
+
+from ymltoxml.templates import xform_id
+from ymltoxml.utils import text_file_reader
+
+OPTS = {
+    'file_encoding': 'utf-8',
+    'output_format': 'raw',
+    'default_csv_hdr': None,
+}
+
+# read in some json "column data"
+data = text_file_reader('tests/data/OE-expanded-profile-all-ids.txt', OPTS)
+if data[0].isupper():
+    lc_ids = [xform_id(x) for x in data]
+
+# spit out lowercase id format
+for ctl in os_sorted(lc_ids):
+    print(ctl)

src/ymltoxml/data/oscal.yaml

@@ -9,7 +9,7 @@ default_ssg_glob: 'nist_rhcos4.yml'
 default_ssg_path: 'ext/content/controls'
 default_lookup_key: 'controls'
 default_csv_hdr: null
-new_csv_header: 'New Header'
+new_csv_hdrs: []
 input_format: null
 output_format: 'json'
 preserve_quotes: true

src/ymltoxml/oscal.py

@@ -41,7 +41,8 @@ def csv_append_id_data(in_ids, prog_opts, uargs):  # pragma: no cover
     writer = csv.writer(open(new_opath, 'w', newline='', encoding='utf-8'))
     reader = csv.reader(open(uargs.munge, 'r', newline='', encoding='utf-8'))
     headers = next(reader)
-    headers.append(prog_opts['new_csv_header'])
+    for hdr in prog_opts['new_csv_hdrs']:
+        headers.append(hdr)
     writer.writerow(headers)
 
     for ctl in reader:
@@ -50,6 +51,7 @@ def csv_append_id_data(in_ids, prog_opts, uargs):  # pragma: no cover
             ctl.append('Y')
         else:
             ctl.append('N')
+        ctl.append(ctl_id)
         writer.writerow(ctl)